diff options
Diffstat (limited to 'src/lib/libssl/ssl_algs.c')
| -rw-r--r-- | src/lib/libssl/ssl_algs.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c index 65f3a59386..a91ee6d22e 100644 --- a/src/lib/libssl/ssl_algs.c +++ b/src/lib/libssl/ssl_algs.c | |||
| @@ -57,11 +57,11 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include "objects.h" | 60 | #include <openssl/objects.h> |
| 61 | #include "lhash.h" | 61 | #include <openssl/lhash.h> |
| 62 | #include "ssl_locl.h" | 62 | #include "ssl_locl.h" |
| 63 | 63 | ||
| 64 | void SSLeay_add_ssl_algorithms() | 64 | int SSL_library_init(void) |
| 65 | { | 65 | { |
| 66 | #ifndef NO_DES | 66 | #ifndef NO_DES |
| 67 | EVP_add_cipher(EVP_des_cbc()); | 67 | EVP_add_cipher(EVP_des_cbc()); |
| @@ -71,25 +71,25 @@ void SSLeay_add_ssl_algorithms() | |||
| 71 | EVP_add_cipher(EVP_idea_cbc()); | 71 | EVP_add_cipher(EVP_idea_cbc()); |
| 72 | #endif | 72 | #endif |
| 73 | #ifndef NO_RC4 | 73 | #ifndef NO_RC4 |
| 74 | EVP_add_cipher(EVP_rc4()); | 74 | EVP_add_cipher(EVP_rc4()); |
| 75 | #endif | 75 | #endif |
| 76 | #ifndef NO_RC2 | 76 | #ifndef NO_RC2 |
| 77 | EVP_add_cipher(EVP_rc2_cbc()); | 77 | EVP_add_cipher(EVP_rc2_cbc()); |
| 78 | #endif | 78 | #endif |
| 79 | 79 | ||
| 80 | #ifndef NO_MD2 | 80 | #ifndef NO_MD2 |
| 81 | EVP_add_digest(EVP_md2()); | 81 | EVP_add_digest(EVP_md2()); |
| 82 | #endif | 82 | #endif |
| 83 | #ifndef NO_MD5 | 83 | #ifndef NO_MD5 |
| 84 | EVP_add_digest(EVP_md5()); | 84 | EVP_add_digest(EVP_md5()); |
| 85 | EVP_add_alias(SN_md5,"ssl2-md5"); | 85 | EVP_add_digest_alias(SN_md5,"ssl2-md5"); |
| 86 | EVP_add_alias(SN_md5,"ssl3-md5"); | 86 | EVP_add_digest_alias(SN_md5,"ssl3-md5"); |
| 87 | #endif | 87 | #endif |
| 88 | #ifndef NO_SHA1 | 88 | #ifndef NO_SHA |
| 89 | EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ | 89 | EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ |
| 90 | EVP_add_alias(SN_sha1,"ssl3-sha1"); | 90 | EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); |
| 91 | #endif | 91 | #endif |
| 92 | #if !defined(NO_SHA1) && !defined(NO_DSA) | 92 | #if !defined(NO_SHA) && !defined(NO_DSA) |
| 93 | EVP_add_digest(EVP_dss1()); /* DSA with sha1 */ | 93 | EVP_add_digest(EVP_dss1()); /* DSA with sha1 */ |
| 94 | #endif | 94 | #endif |
| 95 | 95 | ||
| @@ -98,5 +98,6 @@ void SSLeay_add_ssl_algorithms() | |||
| 98 | EVP_add_digest(EVP_sha()); | 98 | EVP_add_digest(EVP_sha()); |
| 99 | EVP_add_digest(EVP_dss()); | 99 | EVP_add_digest(EVP_dss()); |
| 100 | #endif | 100 | #endif |
| 101 | return(1); | ||
| 101 | } | 102 | } |
| 102 | 103 | ||
