X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fc_all.c;h=a4d3b43fb9d45d47661a918f4d08f0e0fc0222cf;hb=10cea23bd46cb43fab1de5c59828ae67f80975c3;hp=f2e0500dd379f8cb276df41e5c9082cd5a133736;hpb=dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c;p=oweals%2Fopenssl.git

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index f2e0500dd3..a4d3b43fb9 100644
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -58,16 +58,17 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/pkcs12.h>
+#include <openssl/objects.h>
 
-void SSLeay_add_all_algorithms()
+void SSLeay_add_all_algorithms(void)
 	{
 	SSLeay_add_all_ciphers();
 	SSLeay_add_all_digests();
 	}
 
-void SSLeay_add_all_ciphers()
+void SSLeay_add_all_ciphers(void)
 	{
 #ifndef NO_DES
 	EVP_add_cipher(EVP_des_cfb());
@@ -120,7 +121,7 @@ void SSLeay_add_all_ciphers()
 	EVP_add_cipher_alias(SN_rc2_cbc,"rc2");
 #endif
 
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
 	EVP_add_cipher(EVP_bf_ecb());
 	EVP_add_cipher(EVP_bf_cfb());
 	EVP_add_cipher(EVP_bf_ofb());
@@ -152,7 +153,7 @@ void SSLeay_add_all_ciphers()
 	}
 
 
-void SSLeay_add_all_digests()
+void SSLeay_add_all_digests(void)
 	{
 #ifndef NO_MD2
 	EVP_add_digest(EVP_md2());
@@ -168,7 +169,7 @@ void SSLeay_add_all_digests()
 	EVP_add_digest(EVP_dss());
 #endif
 #endif
-#ifndef NO_SHA1
+#ifndef NO_SHA
 	EVP_add_digest(EVP_sha1());
 	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
 	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
@@ -182,9 +183,11 @@ void SSLeay_add_all_digests()
 #if !defined(NO_MDC2) && !defined(NO_DES)
 	EVP_add_digest(EVP_mdc2());
 #endif
-#ifndef NO_RMD160
+#ifndef NO_RIPEMD
 	EVP_add_digest(EVP_ripemd160());
 	EVP_add_digest_alias(SN_ripemd160,"ripemd");
 	EVP_add_digest_alias(SN_ripemd160,"rmd160");
 #endif
+	PKCS12_PBE_add();
+	PKCS5_PBE_add();
 	}