Don't shadow.

[oweals/openssl.git] / crypto / evp / c_all.c

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 51f7aba805f5d8d7586efce6cd4ad8a5fb3948d6..a4d3b43fb9d45d47661a918f4d08f0e0fc0222cf 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -58,17 +58,17 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "pkcs12.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());
@@ -121,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());
@@ -153,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());
@@ -169,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);
@@ -183,10 +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();
        }