summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/evp.h
diff options
context:
space:
mode:
authorbeck <>2002-06-07 03:45:34 +0000
committerbeck <>2002-06-07 03:45:34 +0000
commit820a20ea2b5f97e4a8fb714fedf33edafd40740a (patch)
tree595b35cf9e1ff104d11fb8ab64ebb6a5c5f42755 /src/lib/libcrypto/evp/evp.h
parentd13d58e31ac54f9b283fe3ec100f31030e050fb4 (diff)
downloadopenbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.gz
openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.bz2
openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.zip
Merge OpenSSL 0.9.7-stable-20020605,
correctly autogenerate obj_mac.h
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/evp/evp.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 0d870d60be..fb16de6852 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -641,10 +641,25 @@ const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
641#ifndef OPENSSL_NO_AES 641#ifndef OPENSSL_NO_AES
642const EVP_CIPHER *EVP_aes_128_ecb(void); 642const EVP_CIPHER *EVP_aes_128_ecb(void);
643const EVP_CIPHER *EVP_aes_128_cbc(void); 643const EVP_CIPHER *EVP_aes_128_cbc(void);
644const EVP_CIPHER *EVP_aes_128_cfb(void);
645const EVP_CIPHER *EVP_aes_128_ofb(void);
646#if 0
647const EVP_CIPHER *EVP_aes_128_ctr(void);
648#endif
644const EVP_CIPHER *EVP_aes_192_ecb(void); 649const EVP_CIPHER *EVP_aes_192_ecb(void);
645const EVP_CIPHER *EVP_aes_192_cbc(void); 650const EVP_CIPHER *EVP_aes_192_cbc(void);
651const EVP_CIPHER *EVP_aes_192_cfb(void);
652const EVP_CIPHER *EVP_aes_192_ofb(void);
653#if 0
654const EVP_CIPHER *EVP_aes_192_ctr(void);
655#endif
646const EVP_CIPHER *EVP_aes_256_ecb(void); 656const EVP_CIPHER *EVP_aes_256_ecb(void);
647const EVP_CIPHER *EVP_aes_256_cbc(void); 657const EVP_CIPHER *EVP_aes_256_cbc(void);
658const EVP_CIPHER *EVP_aes_256_cfb(void);
659const EVP_CIPHER *EVP_aes_256_ofb(void);
660#if 0
661const EVP_CIPHER *EVP_aes_256_ctr(void);
662#endif
648#endif 663#endif
649 664
650void OPENSSL_add_all_algorithms_noconf(void); 665void OPENSSL_add_all_algorithms_noconf(void);