048-weak-ciphers.patch revision 7361
6017N/A# Remove MD2, MD4: some functions need to be stubbed
6017N/A# Deprecate DES, RC2, RC4, and MD5
6017N/A# Patch developed in-house. Solaris-specific; not suitable for upstream.
6017N/A--- openssl-1.x/crypto/des/des.h Thu Feb 25 07:42:06 2016
6017N/A+++ openssl-1.x/crypto/des/des.h.new Thu Feb 25 08:37:40 2016
6017N/A@@ -132,24 +132,38 @@
6017N/A void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
6017N/A DES_key_schedule *ks1, DES_key_schedule *ks2,
6017N/A DES_key_schedule *ks3, int enc);
6017N/A+
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark DES functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output,
6017N/A long length, DES_key_schedule *schedule,
6017N/A const_DES_cblock *ivec);
6017N/A /* DES_cbc_encrypt does not update the IV! Use DES_ncbc_encrypt instead. */
6017N/A-void DES_cbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A+DEPRECATED void DES_cbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, int enc);
6017N/A-void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A+DEPRECATED void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, int enc);
6017N/A-void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A+DEPRECATED void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, const_DES_cblock *inw,
6017N/A const_DES_cblock *outw, int enc);
6017N/A-void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
6017N/A+DEPRECATED void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, int enc);
6017N/A-void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
6017N/A+DEPRECATED void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
6017N/A DES_key_schedule *ks, int enc);
6017N/A
6017N/A /*
6017N/A@@ -204,19 +218,19 @@
6017N/A DES_cblock *out_white);
6017N/A # endif
6017N/A
6017N/A-int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
6017N/A+DEPRECATED int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
6017N/A DES_cblock *iv);
6017N/A-int DES_enc_write(int fd, const void *buf, int len, DES_key_schedule *sched,
6017N/A+DEPRECATED int DES_enc_write(int fd, const void *buf, int len, DES_key_schedule *sched,
6017N/A DES_cblock *iv);
6017N/A-char *DES_fcrypt(const char *buf, const char *salt, char *ret);
6017N/A-char *DES_crypt(const char *buf, const char *salt);
6017N/A-void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
6017N/A+DEPRECATED char *DES_fcrypt(const char *buf, const char *salt, char *ret);
6017N/A+DEPRECATED char *DES_crypt(const char *buf, const char *salt);
6017N/A+DEPRECATED void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec);
6017N/A-void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A+DEPRECATED void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, int enc);
6017N/A-DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
6017N/A+DEPRECATED DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
6017N/A long length, int out_count, DES_cblock *seed);
6017N/A int DES_random_key(DES_cblock *ret);
6017N/A void DES_set_odd_parity(DES_cblock *key);
6017N/A@@ -237,10 +251,10 @@
6017N/A # endif
6017N/A void DES_string_to_key(const char *str, DES_cblock *key);
6017N/A void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2);
6017N/A-void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A+DEPRECATED void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, int *num, int enc);
6017N/A-void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A+DEPRECATED void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A long length, DES_key_schedule *schedule,
6017N/A DES_cblock *ivec, int *num);
6017N/A
6017N/A--- openssl-1.x/crypto/md5/md5.h Thu Feb 25 07:42:06 2016
6017N/A+++ openssl-1.x/crypto/md5/md5.h.new Thu Feb 25 08:39:36 2016
6017N/A@@ -104,14 +104,28 @@
6017N/A unsigned int num;
6017N/A } MD5_CTX;
6017N/A
6017N/A+
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark MD5 functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A # ifdef OPENSSL_FIPS
6017N/A int private_MD5_Init(MD5_CTX *c);
6017N/A # endif
6017N/A-int MD5_Init(MD5_CTX *c);
6017N/A-int MD5_Update(MD5_CTX *c, const void *data, size_t len);
6017N/A-int MD5_Final(unsigned char *md, MD5_CTX *c);
6017N/A-unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
6017N/A-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
6017N/A+DEPRECATED int MD5_Init(MD5_CTX *c);
6017N/A+DEPRECATED int MD5_Update(MD5_CTX *c, const void *data, size_t len);
6017N/A+DEPRECATED int MD5_Final(unsigned char *md, MD5_CTX *c);
6017N/A+DEPRECATED unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
6017N/A+DEPRECATED void MD5_Transform(MD5_CTX *c, const unsigned char *b);
6017N/A #ifdef __cplusplus
6017N/A }
6017N/A #endif
6017N/A--- openssl-1.x/crypto/rc4/rc4.h Thu Feb 25 07:42:06 2016
6017N/A+++ openssl-1.x/crypto/rc4/rc4.h.new Thu Feb 25 08:38:33 2016
6017N/A@@ -75,10 +75,23 @@
6017N/A RC4_INT data[256];
6017N/A } RC4_KEY;
6017N/A
6017N/A-const char *RC4_options(void);
6017N/A-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
6017N/A-void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
6017N/A-void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark RC4 functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A+DEPRECATED const char *RC4_options(void);
6017N/A+DEPRECATED void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
6017N/A+DEPRECATED void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
6017N/A+DEPRECATED void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
6017N/A unsigned char *outdata);
6017N/A
6017N/A #ifdef __cplusplus
6017N/A--- openssl-1.x/crypto/pem/pem.h Fri Sep 11 00:42:09 2015
6017N/A+++ openssl-1.x/crypto/pem/pem.h.new Thu Feb 25 08:47:04 2016
6017N/A@@ -520,9 +520,24 @@
6017N/A EVP_PKEY *b2i_PublicKey_bio(BIO *in);
6017N/A int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);
6017N/A int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);
6017N/A+
6017N/A+
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark RC4 functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A # ifndef OPENSSL_NO_RC4
6017N/A-EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
6017N/A-int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
6017N/A+DEPRECATED EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
6017N/A+DEPRECATED int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
6017N/A pem_password_cb *cb, void *u);
6017N/A # endif
6017N/A
6017N/A--- openssl-1.x/crypto/rsa/rsa.h Fri Sep 11 00:42:09 2015
6017N/A+++ openssl-1.x/crypto/rsa/rsa.h.new Thu Feb 25 08:47:08 2016
6017N/A@@ -387,18 +387,31 @@
6017N/A int RSA_print(BIO *bp, const RSA *r, int offset);
6017N/A # endif
6017N/A
6017N/A+
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark RC4 functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A # ifndef OPENSSL_NO_RC4
6017N/A-int i2d_RSA_NET(const RSA *a, unsigned char **pp,
6017N/A+DEPRECATED int i2d_RSA_NET(const RSA *a, unsigned char **pp,
6017N/A int (*cb) (char *buf, int len, const char *prompt,
6017N/A int verify), int sgckey);
6017N/A-RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
6017N/A+DEPRECATED RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
6017N/A int (*cb) (char *buf, int len, const char *prompt,
6017N/A int verify), int sgckey);
6017N/A-
6017N/A-int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
6017N/A+DEPRECATED int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
6017N/A int (*cb) (char *buf, int len, const char *prompt,
6017N/A int verify));
6017N/A-RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
6017N/A+DEPRECATED RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
6017N/A int (*cb) (char *buf, int len, const char *prompt,
6017N/A int verify));
6017N/A # endif
6017N/A--- openssl-1.x/crypto/x509/x509.h Fri Sep 11 00:42:09 2015
6017N/A+++ openssl-1.x/crypto/x509/x509.h.new Thu Feb 25 08:47:12 2016
6017N/A@@ -970,9 +970,22 @@
6017N/A int X509_subject_name_cmp(const X509 *a, const X509 *b);
6017N/A unsigned long X509_subject_name_hash(X509 *x);
6017N/A
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark MD5 functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A # ifndef OPENSSL_NO_MD5
6017N/A-unsigned long X509_issuer_name_hash_old(X509 *a);
6017N/A-unsigned long X509_subject_name_hash_old(X509 *x);
6017N/A+DEPRECATED unsigned long X509_issuer_name_hash_old(X509 *a);
6017N/A+DEPRECATED unsigned long X509_subject_name_hash_old(X509 *x);
6017N/A # endif
6017N/A
6017N/A int X509_cmp(const X509 *a, const X509 *b);
6017N/A$ diff -ru e_rc2.c e_rc2.c.new
6017N/A--- a/crypto/rc2/rc2.h.orig Thu Apr 14 12:23:50 2016
6017N/A+++ b/crypto/rc2/rc2.h Thu Apr 14 12:27:16 2016
6017N/A@@ -82,17 +82,32 @@
6017N/A void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,
6017N/A int bits);
6017N/A # endif
6017N/A-void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits);
6017N/A-void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out,
6017N/A+
6017N/A+
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+/* Mark RC2 functions deprecated */
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A+DEPRECATED void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits);
6017N/A+DEPRECATED void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out,
6017N/A RC2_KEY *key, int enc);
6017N/A-void RC2_encrypt(unsigned long *data, RC2_KEY *key);
6017N/A-void RC2_decrypt(unsigned long *data, RC2_KEY *key);
6017N/A-void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
6017N/A+DEPRECATED void RC2_encrypt(unsigned long *data, RC2_KEY *key);
6017N/A+DEPRECATED void RC2_decrypt(unsigned long *data, RC2_KEY *key);
6017N/A+DEPRECATED void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
6017N/A RC2_KEY *ks, unsigned char *iv, int enc);
6017N/A-void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A+DEPRECATED void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A long length, RC2_KEY *schedule, unsigned char *ivec,
6017N/A int *num, int enc);
6017N/A-void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A+DEPRECATED void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
6017N/A long length, RC2_KEY *schedule, unsigned char *ivec,
6017N/A int *num);
6017N/A
6017N/A--- old/crypto/md4/md4.h Thu Apr 21 09:34:15 2016
6017N/A+++ new/crypto/md4/md4.h Thu Apr 21 09:36:51 2016
6017N/A@@ -104,14 +104,30 @@
6017N/A unsigned int num;
6017N/A } MD4_CTX;
6017N/A
6017N/A+/*
6017N/A+ * Deprecate MD4
6017N/A+ */
6017N/A+#ifndef __has_attribute
7361N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A+
6017N/A # ifdef OPENSSL_FIPS
6017N/A-int private_MD4_Init(MD4_CTX *c);
6017N/A+DEPRECATED int private_MD4_Init(MD4_CTX *c);
6017N/A # endif
6017N/A-int MD4_Init(MD4_CTX *c);
6017N/A-int MD4_Update(MD4_CTX *c, const void *data, size_t len);
6017N/A-int MD4_Final(unsigned char *md, MD4_CTX *c);
6017N/A-unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
6017N/A-void MD4_Transform(MD4_CTX *c, const unsigned char *b);
6017N/A+DEPRECATED int MD4_Init(MD4_CTX *c);
6017N/A+DEPRECATED int MD4_Update(MD4_CTX *c, const void *data, size_t len);
6017N/A+DEPRECATED int MD4_Final(unsigned char *md, MD4_CTX *c);
6017N/A+DEPRECATED unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
6017N/A+DEPRECATED void MD4_Transform(MD4_CTX *c, const unsigned char *b);
6017N/A #ifdef __cplusplus
6017N/A }
6017N/A #endif
6017N/A--- old/crypto/evp/evp.h Tue Mar 1 05:35:53 2016
6017N/A+++ new/crypto/evp/evp.h Thu Apr 21 09:35:07 2016
6017N/A@@ -705,15 +705,31 @@
6017N/A const unsigned char *i, int enc);
6017N/A # endif
6017N/A
6017N/A+
6017N/A+/*
6017N/A+ * Deprecate MD4, MD5, RC2, RC4, and DES
6017N/A+ */
6017N/A+#ifndef __has_attribute
6017N/A+# define __has_attribute(x) 0
6017N/A+#endif
6017N/A+
6017N/A+#if __has_attribute(deprecated) \
6017N/A+ || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
6017N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
6017N/A+# define DEPRECATED __attribute__((deprecated))
6017N/A+#else
6017N/A+# define DEPRECATED
6017N/A+#endif
6017N/A+
6017N/A const EVP_MD *EVP_md_null(void);
6017N/A # ifndef OPENSSL_NO_MD2
6017N/A const EVP_MD *EVP_md2(void);
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_MD4
6017N/A-const EVP_MD *EVP_md4(void);
6017N/A+DEPRECATED const EVP_MD *EVP_md4(void);
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_MD5
6017N/A-const EVP_MD *EVP_md5(void);
6017N/A+DEPRECATED const EVP_MD *EVP_md5(void);
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_SHA
6017N/A const EVP_MD *EVP_sha(void);
6017N/A@@ -741,16 +757,16 @@
6017N/A # endif
6017N/A const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */
6017N/A # ifndef OPENSSL_NO_DES
6017N/A-const EVP_CIPHER *EVP_des_ecb(void);
6017N/A-const EVP_CIPHER *EVP_des_ede(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ecb(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ede(void);
6017N/A const EVP_CIPHER *EVP_des_ede3(void);
6017N/A-const EVP_CIPHER *EVP_des_ede_ecb(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ede_ecb(void);
6017N/A const EVP_CIPHER *EVP_des_ede3_ecb(void);
6017N/A-const EVP_CIPHER *EVP_des_cfb64(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_cfb64(void);
6017N/A # define EVP_des_cfb EVP_des_cfb64
6017N/A-const EVP_CIPHER *EVP_des_cfb1(void);
6017N/A-const EVP_CIPHER *EVP_des_cfb8(void);
6017N/A-const EVP_CIPHER *EVP_des_ede_cfb64(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_cfb1(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_cfb8(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ede_cfb64(void);
6017N/A # define EVP_des_ede_cfb EVP_des_ede_cfb64
6017N/A # if 0
6017N/A const EVP_CIPHER *EVP_des_ede_cfb1(void);
6017N/A@@ -760,13 +776,13 @@
6017N/A # define EVP_des_ede3_cfb EVP_des_ede3_cfb64
6017N/A const EVP_CIPHER *EVP_des_ede3_cfb1(void);
6017N/A const EVP_CIPHER *EVP_des_ede3_cfb8(void);
6017N/A-const EVP_CIPHER *EVP_des_ofb(void);
6017N/A-const EVP_CIPHER *EVP_des_ede_ofb(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ofb(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ede_ofb(void);
6017N/A const EVP_CIPHER *EVP_des_ede3_ofb(void);
6017N/A-const EVP_CIPHER *EVP_des_cbc(void);
6017N/A-const EVP_CIPHER *EVP_des_ede_cbc(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_cbc(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_des_ede_cbc(void);
6017N/A const EVP_CIPHER *EVP_des_ede3_cbc(void);
6017N/A-const EVP_CIPHER *EVP_desx_cbc(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_desx_cbc(void);
6017N/A const EVP_CIPHER *EVP_des_ede3_wrap(void);
6017N/A /*
6017N/A * This should now be supported through the dev_crypto ENGINE. But also, why
6017N/A@@ -782,10 +798,10 @@
6017N/A # endif
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_RC4
6017N/A-const EVP_CIPHER *EVP_rc4(void);
6017N/A-const EVP_CIPHER *EVP_rc4_40(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc4(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc4_40(void);
6017N/A # ifndef OPENSSL_NO_MD5
6017N/A-const EVP_CIPHER *EVP_rc4_hmac_md5(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc4_hmac_md5(void);
6017N/A # endif
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_IDEA
6017N/A@@ -796,13 +812,13 @@
6017N/A const EVP_CIPHER *EVP_idea_cbc(void);
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_RC2
6017N/A-const EVP_CIPHER *EVP_rc2_ecb(void);
6017N/A-const EVP_CIPHER *EVP_rc2_cbc(void);
6017N/A-const EVP_CIPHER *EVP_rc2_40_cbc(void);
6017N/A-const EVP_CIPHER *EVP_rc2_64_cbc(void);
6017N/A-const EVP_CIPHER *EVP_rc2_cfb64(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc2_ecb(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc2_cbc(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc2_40_cbc(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc2_64_cbc(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc2_cfb64(void);
6017N/A # define EVP_rc2_cfb EVP_rc2_cfb64
6017N/A-const EVP_CIPHER *EVP_rc2_ofb(void);
6017N/A+DEPRECATED const EVP_CIPHER *EVP_rc2_ofb(void);
6017N/A # endif
6017N/A # ifndef OPENSSL_NO_BF
6017N/A const EVP_CIPHER *EVP_bf_ecb(void);