diff options
| author | jsing <> | 2017-04-29 21:48:44 +0000 |
|---|---|---|
| committer | jsing <> | 2017-04-29 21:48:44 +0000 |
| commit | 1de47e5fe8ef45dc6638449b6a0decdcf07cc840 (patch) | |
| tree | 4195f946a49f85960dfe69d053abfc95e5e32dd9 /src/lib/libcrypto/evp/names.c | |
| parent | 06e58ee3d445df182278c56c23d0bf1aec820070 (diff) | |
| download | openbsd-1de47e5fe8ef45dc6638449b6a0decdcf07cc840.tar.gz openbsd-1de47e5fe8ef45dc6638449b6a0decdcf07cc840.tar.bz2 openbsd-1de47e5fe8ef45dc6638449b6a0decdcf07cc840.zip | |
Stop calling OPENSSL_init() internally, since it is a no-op. Also place
it under #ifndef LIBRESSL_INTERNAL.
ok beck@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/evp/names.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index 33d7dc8084..ebaa3a2f6f 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: names.c,v 1.12 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: names.c,v 1.13 2017/04/29 21:48:44 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -70,8 +70,6 @@ EVP_add_cipher(const EVP_CIPHER *c) | |||
| 70 | if (c == NULL) | 70 | if (c == NULL) |
| 71 | return 0; | 71 | return 0; |
| 72 | 72 | ||
| 73 | OPENSSL_init(); | ||
| 74 | |||
| 75 | r = OBJ_NAME_add(OBJ_nid2sn(c->nid), OBJ_NAME_TYPE_CIPHER_METH, | 73 | r = OBJ_NAME_add(OBJ_nid2sn(c->nid), OBJ_NAME_TYPE_CIPHER_METH, |
| 76 | (const char *)c); | 74 | (const char *)c); |
| 77 | if (r == 0) | 75 | if (r == 0) |
| @@ -88,8 +86,6 @@ EVP_add_digest(const EVP_MD *md) | |||
| 88 | int r; | 86 | int r; |
| 89 | const char *name; | 87 | const char *name; |
| 90 | 88 | ||
| 91 | OPENSSL_init(); | ||
| 92 | |||
| 93 | name = OBJ_nid2sn(md->type); | 89 | name = OBJ_nid2sn(md->type); |
| 94 | r = OBJ_NAME_add(name, OBJ_NAME_TYPE_MD_METH, (const char *)md); | 90 | r = OBJ_NAME_add(name, OBJ_NAME_TYPE_MD_METH, (const char *)md); |
| 95 | if (r == 0) | 91 | if (r == 0) |
