diff options
| author |   beck <beck@openbsd.org> | 1999-09-29 04:35:07 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 1999-09-29 04:35:07 +0000 |
| commit | 913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0 (patch) | |
| tree | 62c001f84cb6413a049c5c811a08bfbe7c747b77 /lib/libssl/ssl_algs.c | |
| parent | fix byte counters; imain@netidea.com (diff) | |
| download | wireguard-openbsd-913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0.tar.xz wireguard-openbsd-913ec974266f8a62ab2e5ca34a31d6e6f75b3cf0.zip | |
OpenSSL 0.9.4 merge
Diffstat (limited to 'lib/libssl/ssl_algs.c')
| -rw-r--r-- | lib/libssl/ssl_algs.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/libssl/ssl_algs.c b/lib/libssl/ssl_algs.c index 65f3a593869..a91ee6d22e4 100644 --- a/lib/libssl/ssl_algs.c +++ b/lib/libssl/ssl_algs.c @@ -57,11 +57,11 @@ */ #include <stdio.h> -#include "objects.h" -#include "lhash.h" +#include <openssl/objects.h> +#include <openssl/lhash.h> #include "ssl_locl.h" -void SSLeay_add_ssl_algorithms() +int SSL_library_init(void) { #ifndef NO_DES EVP_add_cipher(EVP_des_cbc()); @@ -71,25 +71,25 @@ void SSLeay_add_ssl_algorithms() EVP_add_cipher(EVP_idea_cbc()); #endif #ifndef NO_RC4 - EVP_add_cipher(EVP_rc4()); + EVP_add_cipher(EVP_rc4()); #endif #ifndef NO_RC2 - EVP_add_cipher(EVP_rc2_cbc()); + EVP_add_cipher(EVP_rc2_cbc()); #endif #ifndef NO_MD2 - EVP_add_digest(EVP_md2()); + EVP_add_digest(EVP_md2()); #endif #ifndef NO_MD5 EVP_add_digest(EVP_md5()); - EVP_add_alias(SN_md5,"ssl2-md5"); - EVP_add_alias(SN_md5,"ssl3-md5"); + EVP_add_digest_alias(SN_md5,"ssl2-md5"); + EVP_add_digest_alias(SN_md5,"ssl3-md5"); #endif -#ifndef NO_SHA1 +#ifndef NO_SHA EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ - EVP_add_alias(SN_sha1,"ssl3-sha1"); + EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); #endif -#if !defined(NO_SHA1) && !defined(NO_DSA) +#if !defined(NO_SHA) && !defined(NO_DSA) EVP_add_digest(EVP_dss1()); /* DSA with sha1 */ #endif @@ -98,5 +98,6 @@ void SSLeay_add_ssl_algorithms() EVP_add_digest(EVP_sha()); EVP_add_digest(EVP_dss()); #endif + return(1); } |