Update from fips2 branch.

diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index 0d942603b1b19d34871891097d5e96b1ed287018..b9dbbdcb62843f1d2c375d2dc7f76e279ba1bee2 100644 (file)
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -62,7 +62,7 @@
 #include <openssl/buffer.h>
 #include "bn_lcl.h"
 
-static const char *Hex="0123456789ABCDEF";
+static const char Hex[]="0123456789ABCDEF";
 
 /* Must 'OPENSSL_free' the returned data */
 char *BN_bn2hex(const BIGNUM *a)

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index e63bbe8dbad91626e1614e888edbe60f4034abcd..188342cf5200bc3df09552f4f40567af06d165d6 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -70,7 +70,7 @@ DECLARE_STACK_OF(CRYPTO_dynlock)
 IMPLEMENT_STACK_OF(CRYPTO_dynlock)
 
 /* real #defines in crypto.h, keep these upto date */
-static const char* lock_names[CRYPTO_NUM_LOCKS] =
+static const char* const lock_names[CRYPTO_NUM_LOCKS] =
        {
        "<<ERROR>>",
        "err",

diff --git a/crypto/x509v3/v3_hex.c b/crypto/x509v3/v3_hex.c
index 7b810f7ed1105012341f619e7d45a83afa002029..2a82f21e7f590e994330422b7d6ef0fb27bcdd9e 100644 (file)
--- a/crypto/x509v3/v3_hex.c
+++ b/crypto/x509v3/v3_hex.c
@@ -74,7 +74,7 @@ char *hex_to_string(unsigned char *buffer, long len)
        char *tmp, *q;
        unsigned char *p;
        int i;
-       static char hexdig[] = "0123456789ABCDEF";
+       const static char hexdig[] = "0123456789ABCDEF";
        if(!buffer || !len) return NULL;
        if(!(tmp = OPENSSL_malloc(len * 3 + 1))) {
                X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE);