PR: 1990

[oweals/openssl.git] / crypto / evp / names.c

diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index eb9f4329cd4dda102e7ccb469a49c0530ec35ad9..e2e04c3570f461ae5e941db3de4db91a702310dd 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -66,9 +66,13 @@ int EVP_add_cipher(const EVP_CIPHER *c)
        {
        int r;
 
-       r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c);
+#ifdef OPENSSL_FIPS
+       OPENSSL_init();
+#endif
+
+       r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
        if (r == 0) return(0);
-       r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c);
+       r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
        return(r);
        }
 
@@ -77,10 +81,13 @@ int EVP_add_digest(const EVP_MD *md)
        int r;
        const char *name;
 
+#ifdef OPENSSL_FIPS
+       OPENSSL_init();
+#endif
        name=OBJ_nid2sn(md->type);
-       r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md);
+       r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
        if (r == 0) return(0);
-       r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(char *)md);
+       r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md);
        if (r == 0) return(0);
 
        if (md->type != md->pkey_type)