diff options
| author |   djm <djm@openbsd.org> | 2006-06-27 05:06:51 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2006-06-27 05:06:51 +0000 |
| commit | 6d388760ec629bdebe2f200913a35899243a7957 (patch) | |
| tree | ecc7cf9ca37d08421471848c6f746702ed91b8e8 /lib/libcrypto/evp/c_alld.c | |
| parent | import of openssl-0.9.7j (diff) | |
| download | wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.tar.xz wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/c_alld.c')
| -rw-r--r-- | lib/libcrypto/evp/c_alld.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/libcrypto/evp/c_alld.c b/lib/libcrypto/evp/c_alld.c index aae7bf7482a..929ea56a3eb 100644 --- a/lib/libcrypto/evp/c_alld.c +++ b/lib/libcrypto/evp/c_alld.c @@ -100,4 +100,14 @@ void OpenSSL_add_all_digests(void) EVP_add_digest_alias(SN_ripemd160,"ripemd"); EVP_add_digest_alias(SN_ripemd160,"rmd160"); #endif +#ifdef OPENSSL_FIPS +#ifndef OPENSSL_NO_SHA256 + EVP_add_digest(EVP_sha224()); + EVP_add_digest(EVP_sha256()); +#endif +#ifndef OPENSSL_NO_SHA512 + EVP_add_digest(EVP_sha384()); + EVP_add_digest(EVP_sha512()); +#endif +#endif } |