diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/evp/names.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index 7712453046..88c1e780dd 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
| @@ -61,17 +61,14 @@ | |||
| 61 | #include <openssl/evp.h> | 61 | #include <openssl/evp.h> |
| 62 | #include <openssl/objects.h> | 62 | #include <openssl/objects.h> |
| 63 | #include <openssl/x509.h> | 63 | #include <openssl/x509.h> |
| 64 | #ifdef OPENSSL_FIPS | ||
| 65 | #include <openssl/fips.h> | ||
| 66 | #endif | ||
| 67 | 64 | ||
| 68 | int EVP_add_cipher(const EVP_CIPHER *c) | 65 | int EVP_add_cipher(const EVP_CIPHER *c) |
| 69 | { | 66 | { |
| 70 | int r; | 67 | int r; |
| 71 | 68 | ||
| 72 | r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c); | 69 | r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c); |
| 73 | if (r == 0) return(0); | 70 | if (r == 0) return(0); |
| 74 | r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c); | 71 | r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c); |
| 75 | return(r); | 72 | return(r); |
| 76 | } | 73 | } |
| 77 | 74 | ||
| @@ -81,9 +78,9 @@ int EVP_add_digest(const EVP_MD *md) | |||
| 81 | const char *name; | 78 | const char *name; |
| 82 | 79 | ||
| 83 | name=OBJ_nid2sn(md->type); | 80 | name=OBJ_nid2sn(md->type); |
| 84 | r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md); | 81 | r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md); |
| 85 | if (r == 0) return(0); | 82 | if (r == 0) return(0); |
| 86 | r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(char *)md); | 83 | r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md); |
| 87 | if (r == 0) return(0); | 84 | if (r == 0) return(0); |
| 88 | 85 | ||
| 89 | if (md->type != md->pkey_type) | 86 | if (md->type != md->pkey_type) |
