4 files changed, 9 insertions, 11 deletions
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index d9389a5e5a3..d654eb220ea 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -22,7 +22,7 @@ typedef struct name_funcs_st
 DECLARE_STACK_OF(NAME_FUNCS)
 IMPLEMENT_STACK_OF(NAME_FUNCS)
 
-static STACK_OF(NAME_FUNCS) *name_funcs_stack;
+STACK_OF(NAME_FUNCS) *name_funcs_stack;
 
 static unsigned long obj_name_hash(OBJ_NAME *a);
 static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b);
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index d03460f845d..d4c74cc7751 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,7 +62,7 @@
  */
 
 #define NUM_NID 181
-#define NUM_SN 141
+#define NUM_SN 140
 #define NUM_LN 175
 #define NUM_OBJ 154
 
@@ -472,7 +472,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 	8,&(lvalues[1052]),0},
 {"OCSP","OCSP",NID_ad_OCSP,8,&(lvalues[1060]),0},
 {"caIssuers","CA Issuers",NID_ad_ca_issuers,8,&(lvalues[1068]),0},
-{"OCSPSigning","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1076]),0},
+{"OCSP Signing","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1076]),0},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -521,7 +521,6 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[57]),/* "Netscape" */
 &(nid_objs[17]),/* "O" */
 &(nid_objs[178]),/* "OCSP" */
-&(nid_objs[180]),/* "OCSPSigning" */
 &(nid_objs[18]),/* "OU" */
 &(nid_objs[ 9]),/* "PBE-MD2-DES" */
 &(nid_objs[168]),/* "PBE-MD2-RC2-64" */
diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index 7aec0ed47a6..cef401db277 100644
--- a/crypto/objects/obj_err.c
+++ b/crypto/objects/obj_err.c
@@ -54,8 +54,7 @@
  */
 
 /* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
+ * made to it will be overwritten when the script next updates this file.
  */
 
 #include <stdio.h>
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 2f11517a9a4..d1a5ad25029 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -59,6 +59,10 @@
 #ifndef HEADER_OBJECTS_H
 #define HEADER_OBJECTS_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #define SN_undef			"UNDEF"
 #define LN_undef			"undefined"
 #define NID_undef			0
@@ -945,7 +949,7 @@
 #define NID_ad_ca_issuers		179
 #define OBJ_ad_ca_issuers		OBJ_id_ad,2L
 
-#define SN_OCSP_sign			"OCSPSigning"
+#define SN_OSCP_sign			"OCSPSigning"
 #define LN_OCSP_sign			"OCSP Signing"
 #define NID_OCSP_sign			180
 #define OBJ_OCSP_sign			OBJ_id_kp,9L
@@ -963,10 +967,6 @@
 #define	OBJ_NAME_ALIAS		0x8000
 
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 typedef struct obj_name_st
 	{
 	int type;