OpenSSL 0.9.5a merge

3 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
index d654eb220e..d9389a5e5a 100644
--- a/src/lib/libcrypto/objects/o_names.c
+++ b/src/lib/libcrypto/objects/o_names.c
@@ -22,7 +22,7 @@ typedef struct name_funcs_st
 DECLARE_STACK_OF(NAME_FUNCS)
 IMPLEMENT_STACK_OF(NAME_FUNCS)
 
-STACK_OF(NAME_FUNCS) *name_funcs_stack;
+static 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/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c
index cef401db27..7aec0ed47a 100644
--- a/src/lib/libcrypto/objects/obj_err.c
+++ b/src/lib/libcrypto/objects/obj_err.c
@@ -54,7 +54,8 @@
  */
 
 /* 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.
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
  */
 
 #include <stdio.h>
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index d1a5ad2502..95c8a21568 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -949,7 +949,7 @@ extern "C" {
 #define NID_ad_ca_issuers               179
 #define OBJ_ad_ca_issuers               OBJ_id_ad,2L
 
-#define SN_OSCP_sign                    "OCSPSigning"
+#define SN_OCSP_sign                    "OCSPSigning"
 #define LN_OCSP_sign                    "OCSP Signing"
 #define NID_OCSP_sign                   180
 #define OBJ_OCSP_sign                   OBJ_id_kp,9L