[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Wed Jan 15 21:09:07 UTC 2020
The branch master has been updated
via 62c3fed0cd52316259e4e2c0e5878bcfa69b38f9 (commit)
via 26aae51347465764c755f0985bd1ac85d3f734e6 (commit)
via a8fca7284a98ca58804e17ade92fadd7a62056ae (commit)
via ae856791e264fed50b8ee5070fcee7af11e7691c (commit)
via ee2993abd0830ec27a2dd49e07db8d0eb5f3e579 (commit)
via 49742fd412665d2211523ac2925640e3be9d9ab3 (commit)
from 28c690cb7dd80c15c9fa45df518c555c66ad67f8 (commit)
- Log -----------------------------------------------------------------
commit 62c3fed0cd52316259e4e2c0e5878bcfa69b38f9
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jan 14 10:33:03 2020 +1000
Deprecate the low level RC5 functions
Use of the low level RC5 functions has been informally discouraged for a long
time. We now formally deprecate them.
Applications should instead use the EVP APIs, e.g. EVP_EncryptInit_ex,
EVP_EncryptUpdate, EVP_EncryptFinal_ex and the equivalently named decrypt
functions.
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
commit 26aae51347465764c755f0985bd1ac85d3f734e6
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jan 14 09:03:55 2020 +1000
rc5: fix preprocessor indentation
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
commit a8fca7284a98ca58804e17ade92fadd7a62056ae
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jan 14 09:38:09 2020 +1000
Deprecate the low level RC4 functions
Use of the low level RC4 functions has been informally discouraged for a long
time. We now formally deprecate them.
Applications should instead use the EVP APIs, e.g. EVP_EncryptInit_ex,
EVP_EncryptUpdate, EVP_EncryptFinal_ex and the equivalently named decrypt
functions.
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
commit ae856791e264fed50b8ee5070fcee7af11e7691c
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jan 14 09:03:55 2020 +1000
rc4: fix preprocessor indentation
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
commit ee2993abd0830ec27a2dd49e07db8d0eb5f3e579
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jan 14 09:15:18 2020 +1000
Deprecate the low level RC2 functions
Use of the low level RC2 functions has been informally discouraged for a
long time. We now formally deprecate them.
Applications should instead use the EVP APIs, e.g. EVP_EncryptInit_ex,
EVP_EncryptUpdate, EVP_EncryptFinal_ex, and the equivalently named decrypt
functions.
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
commit 49742fd412665d2211523ac2925640e3be9d9ab3
Author: Pauli <paul.dale at oracle.com>
Date: Tue Jan 14 09:03:54 2020 +1000
rc2: fix preprocessor indentation
Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
-----------------------------------------------------------------------
Summary of changes:
apps/speed.c | 26 ++++-----
apps/version.c | 6 ---
crypto/engine/eng_openssl.c | 6 +++
crypto/evp/e_rc2.c | 6 +++
crypto/evp/e_rc4.c | 6 +++
crypto/evp/e_rc4_hmac_md5.c | 6 +++
crypto/evp/e_rc5.c | 6 +++
crypto/rc2/rc2_cbc.c | 6 +++
crypto/rc2/rc2_ecb.c | 6 +++
crypto/rc2/rc2_skey.c | 6 +++
crypto/rc2/rc2cfb64.c | 6 +++
crypto/rc2/rc2ofb64.c | 6 +++
crypto/rc4/rc4_enc.c | 6 +++
crypto/rc4/rc4_skey.c | 6 +++
crypto/rc5/rc5_ecb.c | 6 +++
crypto/rc5/rc5_enc.c | 6 +++
crypto/rc5/rc5_skey.c | 6 +++
crypto/rc5/rc5cfb64.c | 6 +++
crypto/rc5/rc5ofb64.c | 6 +++
doc/man3/RC4_set_key.pod | 12 +++++
include/openssl/rc2.h | 53 +++++++++++--------
include/openssl/rc4.h | 21 ++++----
include/openssl/rc5.h | 61 ++++++++++++----------
providers/implementations/ciphers/cipher_rc2.c | 6 +++
providers/implementations/ciphers/cipher_rc2_hw.c | 6 +++
providers/implementations/ciphers/cipher_rc4.c | 6 +++
.../implementations/ciphers/cipher_rc4_hmac_md5.c | 6 +++
.../ciphers/cipher_rc4_hmac_md5_hw.c | 6 +++
providers/implementations/ciphers/cipher_rc4_hw.c | 6 +++
providers/implementations/ciphers/cipher_rc5.c | 6 +++
providers/implementations/ciphers/cipher_rc5_hw.c | 6 +++
test/build.info | 24 ++++-----
test/rc2test.c | 6 +++
test/rc4test.c | 6 +++
test/rc5test.c | 6 +++
util/libcrypto.num | 34 ++++++------
36 files changed, 298 insertions(+), 107 deletions(-)
diff --git a/apps/speed.c b/apps/speed.c
index ef14ad6380..d741f315e2 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -353,7 +353,7 @@ static const OPT_PAIR doit_choices[] = {
{"rmd160", D_RMD160},
{"ripemd160", D_RMD160},
#endif
-#ifndef OPENSSL_NO_RC4
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
{"rc4", D_RC4},
#endif
#ifndef OPENSSL_NO_DES
@@ -368,11 +368,11 @@ static const OPT_PAIR doit_choices[] = {
{"aes-192-ige", D_IGE_192_AES},
{"aes-256-ige", D_IGE_256_AES},
#endif
-#ifndef OPENSSL_NO_RC2
+#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
{"rc2-cbc", D_CBC_RC2},
{"rc2", D_CBC_RC2},
#endif
-#ifndef OPENSSL_NO_RC5
+#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
{"rc5-cbc", D_CBC_RC5},
{"rc5", D_CBC_RC5},
#endif
@@ -712,7 +712,7 @@ static int EVP_Digest_RMD160_loop(void *args)
}
#endif
-#ifndef OPENSSL_NO_RC4
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
static RC4_KEY rc4_ks;
static int RC4_loop(void *args)
{
@@ -1449,10 +1449,10 @@ int speed_main(int argc, char **argv)
EdDSA_SECONDS, SM2_SECONDS };
/* What follows are the buffers and key material. */
-#ifndef OPENSSL_NO_RC5
+#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
RC5_32_KEY rc5_ks;
#endif
-#ifndef OPENSSL_NO_RC2
+#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
RC2_KEY rc2_ks;
#endif
#ifndef OPENSSL_NO_IDEA
@@ -1973,15 +1973,15 @@ int speed_main(int argc, char **argv)
if (doit[D_CBC_SEED])
SEED_set_key(key16, &seed_ks);
#endif
-#ifndef OPENSSL_NO_RC4
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
if (doit[D_RC4])
RC4_set_key(&rc4_ks, 16, key16);
#endif
-#ifndef OPENSSL_NO_RC2
+#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
if (doit[D_CBC_RC2])
RC2_set_key(&rc2_ks, 16, key16, 128);
#endif
-#ifndef OPENSSL_NO_RC5
+#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
if (doit[D_CBC_RC5])
if (!RC5_32_set_key(&rc5_ks, 16, key16, 12)) {
BIO_printf(bio_err, "Failed setting RC5 key\n");
@@ -2379,7 +2379,7 @@ int speed_main(int argc, char **argv)
}
}
#endif
-#ifndef OPENSSL_NO_RC4
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
if (doit[D_RC4]) {
for (testnum = 0; testnum < size_num; testnum++) {
print_message(names[D_RC4], c[D_RC4][testnum], lengths[testnum],
@@ -2604,7 +2604,7 @@ int speed_main(int argc, char **argv)
}
}
#endif
-#ifndef OPENSSL_NO_RC2
+#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
if (doit[D_CBC_RC2]) {
if (async_jobs > 0) {
BIO_printf(bio_err, "Async mode is not supported with %s\n",
@@ -2628,7 +2628,7 @@ int speed_main(int argc, char **argv)
}
}
#endif
-#ifndef OPENSSL_NO_RC5
+#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
if (doit[D_CBC_RC5]) {
if (async_jobs > 0) {
BIO_printf(bio_err, "Async mode is not supported with %s\n",
@@ -3492,7 +3492,7 @@ int speed_main(int argc, char **argv)
#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
printf("%s ", MD2_options());
#endif
-#ifndef OPENSSL_NO_RC4
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
printf("%s ", RC4_options());
#endif
#ifndef OPENSSL_NO_DES
diff --git a/apps/version.c b/apps/version.c
index 09d903d844..deb9133855 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -18,9 +18,6 @@
#ifndef OPENSSL_NO_MD2
# include <openssl/md2.h>
#endif
-#ifndef OPENSSL_NO_RC4
-# include <openssl/rc4.h>
-#endif
#ifndef OPENSSL_NO_DES
# include <openssl/des.h>
#endif
@@ -129,9 +126,6 @@ opthelp:
if (options) {
printf("options: ");
printf(" %s", BN_options());
-#ifndef OPENSSL_NO_RC4
- printf(" %s", RC4_options());
-#endif
#ifndef OPENSSL_NO_DES
printf(" %s", DES_options());
#endif
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index b5c087830c..704268ad97 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -8,6 +8,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <stdio.h>
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c
index d2201b000a..a3c09c86a1 100644
--- a/crypto/evp/e_rc2.c
+++ b/crypto/evp/e_rc2.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <stdio.h>
#include "internal/cryptlib.h"
diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index 092d6cf1db..f75e2d716e 100644
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <stdio.h>
#include "internal/cryptlib.h"
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index f0168219f1..fa838bf4b2 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <internal/cryptlib.h>
#include <openssl/opensslconf.h>
diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 4783cc31ca..96066e8532 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <stdio.h>
#include "internal/cryptlib.h"
diff --git a/crypto/rc2/rc2_cbc.c b/crypto/rc2/rc2_cbc.c
index 58a4b3e615..acfd4fde1c 100644
--- a/crypto/rc2/rc2_cbc.c
+++ b/crypto/rc2/rc2_cbc.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc2.h>
#include "rc2_local.h"
diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
index fec2c10174..da086e6598 100644
--- a/crypto/rc2/rc2_ecb.c
+++ b/crypto/rc2/rc2_ecb.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc2.h>
#include "rc2_local.h"
#include <openssl/opensslv.h>
diff --git a/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c
index 33068d4802..542ce0f6f9 100644
--- a/crypto/rc2/rc2_skey.c
+++ b/crypto/rc2/rc2_skey.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc2.h>
#include "rc2_local.h"
diff --git a/crypto/rc2/rc2cfb64.c b/crypto/rc2/rc2cfb64.c
index 9b85368db1..298be79d44 100644
--- a/crypto/rc2/rc2cfb64.c
+++ b/crypto/rc2/rc2cfb64.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc2.h>
#include "rc2_local.h"
diff --git a/crypto/rc2/rc2ofb64.c b/crypto/rc2/rc2ofb64.c
index 4270009e51..097f8befe0 100644
--- a/crypto/rc2/rc2ofb64.c
+++ b/crypto/rc2/rc2ofb64.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc2.h>
#include "rc2_local.h"
diff --git a/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c
index c4753d93e0..8479091c6c 100644
--- a/crypto/rc4/rc4_enc.c
+++ b/crypto/rc4/rc4_enc.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc4.h>
#include "rc4_local.h"
diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
index 42c4a20860..e9d60ca03a 100644
--- a/crypto/rc4/rc4_skey.c
+++ b/crypto/rc4/rc4_skey.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc4.h>
#include "rc4_local.h"
#include <openssl/opensslv.h>
diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
index 51c14fd54d..39c36b6156 100644
--- a/crypto/rc5/rc5_ecb.c
+++ b/crypto/rc5/rc5_ecb.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc5.h>
#include "rc5_local.h"
#include <openssl/opensslv.h>
diff --git a/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c
index c91fa99ce8..0fa80a50af 100644
--- a/crypto/rc5/rc5_enc.c
+++ b/crypto/rc5/rc5_enc.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <stdio.h>
#include <openssl/rc5.h>
#include "rc5_local.h"
diff --git a/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c
index 22a5df1486..dc8617f6d5 100644
--- a/crypto/rc5/rc5_skey.c
+++ b/crypto/rc5/rc5_skey.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc5.h>
#include "rc5_local.h"
diff --git a/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c
index 001e1240ab..99b1753ad1 100644
--- a/crypto/rc5/rc5cfb64.c
+++ b/crypto/rc5/rc5cfb64.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc5.h>
#include "rc5_local.h"
diff --git a/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c
index c3ae5d8c05..7fc19fd1ed 100644
--- a/crypto/rc5/rc5ofb64.c
+++ b/crypto/rc5/rc5ofb64.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/rc5.h>
#include "rc5_local.h"
diff --git a/doc/man3/RC4_set_key.pod b/doc/man3/RC4_set_key.pod
index 661a694479..2b314f022b 100644
--- a/doc/man3/RC4_set_key.pod
+++ b/doc/man3/RC4_set_key.pod
@@ -8,6 +8,10 @@ RC4_set_key, RC4 - RC4 encryption
#include <openssl/rc4.h>
+Deprecated since OpenSSL 3.0, can be hidden entirely by defining
+B<OPENSSL_API_COMPAT> with a suitable version value, see
+L<openssl_user_macros(7)>:
+
void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata,
@@ -15,6 +19,10 @@ RC4_set_key, RC4 - RC4 encryption
=head1 DESCRIPTION
+All of the functions described on this page are deprecated. Applications should
+instead use L<EVP_EncryptInit_ex(3)>, L<EVP_EncryptUpdate(3)> and
+L<EVP_EncryptFinal_ex(3)> or the equivalently named decrypt functions.
+
This library implements the Alleged RC4 cipher, which is described for
example in I<Applied Cryptography>. It is believed to be compatible
with RC4[TM], a proprietary cipher of RSA Security Inc.
@@ -54,6 +62,10 @@ multiple encryptions using the same key stream.
L<EVP_EncryptInit(3)>
+=head1 HISTORY
+
+All of these functions were deprecated in OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h
index 250168abf9..2c63c753d2 100644
--- a/include/openssl/rc2.h
+++ b/include/openssl/rc2.h
@@ -19,39 +19,46 @@
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_RC2
-# ifdef __cplusplus
+# ifdef __cplusplus
extern "C" {
-# endif
+# endif
-typedef unsigned int RC2_INT;
+# define RC2_BLOCK 8
+# define RC2_KEY_LENGTH 16
-# define RC2_ENCRYPT 1
-# define RC2_DECRYPT 0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+typedef unsigned int RC2_INT;
-# define RC2_BLOCK 8
-# define RC2_KEY_LENGTH 16
+# define RC2_ENCRYPT 1
+# define RC2_DECRYPT 0
typedef struct rc2_key_st {
RC2_INT data[64];
} RC2_KEY;
+# endif
-void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits);
-void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out,
- RC2_KEY *key, int enc);
-void RC2_encrypt(unsigned long *data, RC2_KEY *key);
-void RC2_decrypt(unsigned long *data, RC2_KEY *key);
-void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
- RC2_KEY *ks, unsigned char *iv, int enc);
-void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC2_KEY *schedule, unsigned char *ivec,
- int *num, int enc);
-void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC2_KEY *schedule, unsigned char *ivec,
- int *num);
-
-# ifdef __cplusplus
+DEPRECATEDIN_3_0(void RC2_set_key(RC2_KEY *key, int len,
+ const unsigned char *data, int bits))
+DEPRECATEDIN_3_0(void RC2_ecb_encrypt(const unsigned char *in,
+ unsigned char *out, RC2_KEY *key,
+ int enc))
+DEPRECATEDIN_3_0(void RC2_encrypt(unsigned long *data, RC2_KEY *key))
+DEPRECATEDIN_3_0(void RC2_decrypt(unsigned long *data, RC2_KEY *key))
+DEPRECATEDIN_3_0(void RC2_cbc_encrypt(const unsigned char *in,
+ unsigned char *out, long length,
+ RC2_KEY *ks, unsigned char *iv, int enc))
+DEPRECATEDIN_3_0(void RC2_cfb64_encrypt(const unsigned char *in,
+ unsigned char *out, long length,
+ RC2_KEY *schedule, unsigned char *ivec,
+ int *num, int enc))
+DEPRECATEDIN_3_0(void RC2_ofb64_encrypt(const unsigned char *in,
+ unsigned char *out, long length,
+ RC2_KEY *schedule, unsigned char *ivec,
+ int *num))
+
+# ifdef __cplusplus
}
-# endif
+# endif
# endif
#endif
diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h
index 6a3a191abf..98ba8d8a2b 100644
--- a/include/openssl/rc4.h
+++ b/include/openssl/rc4.h
@@ -19,24 +19,27 @@
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_RC4
-# include <stddef.h>
-#ifdef __cplusplus
+# include <stddef.h>
+# ifdef __cplusplus
extern "C" {
-#endif
+# endif
+# ifndef OPENSSL_NO_DEPRECATED_3_0
typedef struct rc4_key_st {
RC4_INT x, y;
RC4_INT data[256];
} RC4_KEY;
+# endif
-const char *RC4_options(void);
-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
-void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
- unsigned char *outdata);
+DEPRECATEDIN_3_0(const char *RC4_options(void))
+DEPRECATEDIN_3_0(void RC4_set_key(RC4_KEY *key, int len,
+ const unsigned char *data))
+DEPRECATEDIN_3_0(void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
+ unsigned char *outdata))
-# ifdef __cplusplus
+# ifdef __cplusplus
}
-# endif
+# endif
# endif
#endif
diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h
index 53e23ff915..a9c06d31d6 100644
--- a/include/openssl/rc5.h
+++ b/include/openssl/rc5.h
@@ -19,51 +19,58 @@
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_RC5
-# ifdef __cplusplus
+# ifdef __cplusplus
extern "C" {
-# endif
+# endif
-# define RC5_ENCRYPT 1
-# define RC5_DECRYPT 0
+# define RC5_32_BLOCK 8
+# define RC5_32_KEY_LENGTH 16/* This is a default, max is 255 */
-# define RC5_32_INT unsigned int
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+# define RC5_ENCRYPT 1
+# define RC5_DECRYPT 0
-# define RC5_32_BLOCK 8
-# define RC5_32_KEY_LENGTH 16/* This is a default, max is 255 */
+# define RC5_32_INT unsigned int
/*
* This are the only values supported. Tweak the code if you want more The
* most supported modes will be RC5-32/12/16 RC5-32/16/8
*/
-# define RC5_8_ROUNDS 8
-# define RC5_12_ROUNDS 12
-# define RC5_16_ROUNDS 16
+# define RC5_8_ROUNDS 8
+# define RC5_12_ROUNDS 12
+# define RC5_16_ROUNDS 16
typedef struct rc5_key_st {
/* Number of rounds */
int rounds;
RC5_32_INT data[2 * (RC5_16_ROUNDS + 1)];
} RC5_32_KEY;
+# endif
-int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
- int rounds);
-void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
- RC5_32_KEY *key, int enc);
-void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key);
-void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key);
-void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC5_32_KEY *ks, unsigned char *iv,
- int enc);
-void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC5_32_KEY *schedule,
- unsigned char *ivec, int *num, int enc);
-void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
- long length, RC5_32_KEY *schedule,
- unsigned char *ivec, int *num);
+DEPRECATEDIN_3_0(int RC5_32_set_key(RC5_32_KEY *key, int len,
+ const unsigned char *data, int rounds))
+DEPRECATEDIN_3_0(void RC5_32_ecb_encrypt(const unsigned char *in,
+ unsigned char *out, RC5_32_KEY *key,
+ int enc))
+DEPRECATEDIN_3_0(void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key))
+DEPRECATEDIN_3_0(void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key))
+DEPRECATEDIN_3_0(void RC5_32_cbc_encrypt(const unsigned char *in,
+ unsigned char *out, long length,
+ RC5_32_KEY *ks, unsigned char *iv,
+ int enc))
+DEPRECATEDIN_3_0(void RC5_32_cfb64_encrypt(const unsigned char *in,
+ unsigned char *out, long length,
+ RC5_32_KEY *schedule,
+ unsigned char *ivec, int *num,
+ int enc))
+DEPRECATEDIN_3_0(void RC5_32_ofb64_encrypt(const unsigned char *in,
+ unsigned char *out, long length,
+ RC5_32_KEY *schedule,
+ unsigned char *ivec, int *num))
-# ifdef __cplusplus
+# ifdef __cplusplus
}
-# endif
+# endif
# endif
#endif
diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c
index 604c7ed637..c773407d85 100644
--- a/providers/implementations/ciphers/cipher_rc2.c
+++ b/providers/implementations/ciphers/cipher_rc2.c
@@ -9,6 +9,12 @@
/* Dispatch functions for RC2 cipher modes ecb, cbc, ofb, cfb */
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc2.h"
#include "prov/implementations.h"
#include "prov/providercommonerr.h"
diff --git a/providers/implementations/ciphers/cipher_rc2_hw.c b/providers/implementations/ciphers/cipher_rc2_hw.c
index 83d7560d41..5f0d576c25 100644
--- a/providers/implementations/ciphers/cipher_rc2_hw.c
+++ b/providers/implementations/ciphers/cipher_rc2_hw.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc2.h"
static int cipher_hw_rc2_initkey(PROV_CIPHER_CTX *ctx,
diff --git a/providers/implementations/ciphers/cipher_rc4.c b/providers/implementations/ciphers/cipher_rc4.c
index baf34f7b93..5e6112894f 100644
--- a/providers/implementations/ciphers/cipher_rc4.c
+++ b/providers/implementations/ciphers/cipher_rc4.c
@@ -9,6 +9,12 @@
/* Dispatch functions for RC4 ciphers */
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc4.h"
#include "prov/implementations.h"
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
index e7736bb0f3..876c81d34d 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
@@ -9,6 +9,12 @@
/* Dispatch functions for RC4_HMAC_MD5 cipher */
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc4_hmac_md5.h"
#include "prov/implementations.h"
#include "prov/providercommonerr.h"
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c
index d3098b1b3c..767a1e3e6b 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c
@@ -9,6 +9,12 @@
/* RC4_HMAC_MD5 cipher implementation */
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc4_hmac_md5.h"
#define NO_PAYLOAD_LENGTH ((size_t)-1)
diff --git a/providers/implementations/ciphers/cipher_rc4_hw.c b/providers/implementations/ciphers/cipher_rc4_hw.c
index 503a618914..865b0aaedb 100644
--- a/providers/implementations/ciphers/cipher_rc4_hw.c
+++ b/providers/implementations/ciphers/cipher_rc4_hw.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc4.h"
static int cipher_hw_rc4_initkey(PROV_CIPHER_CTX *ctx,
diff --git a/providers/implementations/ciphers/cipher_rc5.c b/providers/implementations/ciphers/cipher_rc5.c
index e2e1cb6a31..d6026c48f6 100644
--- a/providers/implementations/ciphers/cipher_rc5.c
+++ b/providers/implementations/ciphers/cipher_rc5.c
@@ -9,6 +9,12 @@
/* Dispatch functions for RC5 cipher modes ecb, cbc, ofb, cfb */
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc5.h"
#include "prov/implementations.h"
#include "prov/providercommonerr.h"
diff --git a/providers/implementations/ciphers/cipher_rc5_hw.c b/providers/implementations/ciphers/cipher_rc5_hw.c
index a9a05ba32f..5d858811fc 100644
--- a/providers/implementations/ciphers/cipher_rc5_hw.c
+++ b/providers/implementations/ciphers/cipher_rc5_hw.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "cipher_rc5.h"
static int cipher_hw_rc5_initkey(PROV_CIPHER_CTX *ctx,
diff --git a/test/build.info b/test/build.info
index d8e390197e..9afbdfdbe7 100644
--- a/test/build.info
+++ b/test/build.info
@@ -119,18 +119,6 @@ IF[{- !$disabled{tests} -}]
INCLUDE[hmactest]=../include ../apps/include
DEPEND[hmactest]=../libcrypto libtestutil.a
- SOURCE[rc2test]=rc2test.c
- INCLUDE[rc2test]=../include ../apps/include
- DEPEND[rc2test]=../libcrypto libtestutil.a
-
- SOURCE[rc4test]=rc4test.c
- INCLUDE[rc4test]=../include ../apps/include
- DEPEND[rc4test]=../libcrypto libtestutil.a
-
- SOURCE[rc5test]=rc5test.c
- INCLUDE[rc5test]=../include ../apps/include
- DEPEND[rc5test]=../libcrypto libtestutil.a
-
SOURCE[destest]=destest.c
INCLUDE[destest]=../include ../apps/include
DEPEND[destest]=../libcrypto libtestutil.a
@@ -593,6 +581,18 @@ IF[{- !$disabled{tests} -}]
INCLUDE[sm4_internal_test]=.. ../include ../apps/include ../crypto/include
DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a
+ SOURCE[rc2test]=rc2test.c
+ INCLUDE[rc2test]=../include ../apps/include
+ DEPEND[rc2test]=../libcrypto.a libtestutil.a
+
+ SOURCE[rc4test]=rc4test.c
+ INCLUDE[rc4test]=../include ../apps/include
+ DEPEND[rc4test]=../libcrypto.a libtestutil.a
+
+ SOURCE[rc5test]=rc5test.c
+ INCLUDE[rc5test]=../include ../apps/include
+ DEPEND[rc5test]=../libcrypto.a libtestutil.a
+
SOURCE[ec_internal_test]=ec_internal_test.c
INCLUDE[ec_internal_test]=../include ../crypto/ec ../apps/include ../crypto/include
DEPEND[ec_internal_test]=../libcrypto.a libtestutil.a
diff --git a/test/rc2test.c b/test/rc2test.c
index 9ebc9ecdf5..7b965094fc 100644
--- a/test/rc2test.c
+++ b/test/rc2test.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC2 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include "internal/nelem.h"
#include "testutil.h"
diff --git a/test/rc4test.c b/test/rc4test.c
index 34ec2e016e..ed0bef5006 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC4 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <string.h>
#include "internal/nelem.h"
diff --git a/test/rc5test.c b/test/rc5test.c
index 39a113e859..70f88f0915 100644
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * RC5 low level APIs are deprecated for public use, but still ok for internal
+ * use.
+ */
+#include "internal/deprecated.h"
+
#include <string.h>
#include "internal/nelem.h"
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 4484b361c3..049380a715 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -251,7 +251,7 @@ SXNET_new 255 3_0_0 EXIST::FUNCTION:
EVP_camellia_256_ctr 256 3_0_0 EXIST::FUNCTION:CAMELLIA
d2i_PKCS8_PRIV_KEY_INFO 257 3_0_0 EXIST::FUNCTION:
EVP_md2 259 3_0_0 EXIST::FUNCTION:MD2
-RC2_ecb_encrypt 260 3_0_0 EXIST::FUNCTION:RC2
+RC2_ecb_encrypt 260 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
ENGINE_register_DH 261 3_0_0 EXIST::FUNCTION:ENGINE
ASN1_NULL_free 262 3_0_0 EXIST::FUNCTION:
EC_KEY_copy 263 3_0_0 EXIST::FUNCTION:EC
@@ -341,7 +341,7 @@ OPENSSL_sk_sort 346 3_0_0 EXIST::FUNCTION:
CTLOG_STORE_load_file 347 3_0_0 EXIST::FUNCTION:CT
ASN1_SEQUENCE_it 348 3_0_0 EXIST::FUNCTION:
TS_RESP_CTX_get_tst_info 349 3_0_0 EXIST::FUNCTION:TS
-RC4 350 3_0_0 EXIST::FUNCTION:RC4
+RC4 350 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC4
PKCS7_stream 352 3_0_0 EXIST::FUNCTION:
i2t_ASN1_OBJECT 353 3_0_0 EXIST::FUNCTION:
EC_GROUP_get0_generator 354 3_0_0 EXIST::FUNCTION:EC
@@ -604,7 +604,7 @@ X509at_get_attr 618 3_0_0 EXIST::FUNCTION:
X509_PUBKEY_it 619 3_0_0 EXIST::FUNCTION:
DES_ede3_ofb64_encrypt 620 3_0_0 EXIST::FUNCTION:DES
EC_KEY_METHOD_get_compute_key 621 3_0_0 EXIST::FUNCTION:EC
-RC2_cfb64_encrypt 622 3_0_0 EXIST::FUNCTION:RC2
+RC2_cfb64_encrypt 622 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
EVP_EncryptFinal_ex 623 3_0_0 EXIST::FUNCTION:
ERR_load_RSA_strings 624 3_0_0 EXIST::FUNCTION:
CRYPTO_secure_malloc_done 625 3_0_0 EXIST::FUNCTION:
@@ -778,7 +778,7 @@ PKCS7_dataInit 797 3_0_0 EXIST::FUNCTION:
EVP_PKEY_CTX_set_app_data 798 3_0_0 EXIST::FUNCTION:
a2i_GENERAL_NAME 799 3_0_0 EXIST::FUNCTION:
SXNETID_new 800 3_0_0 EXIST::FUNCTION:
-RC4_options 801 3_0_0 EXIST::FUNCTION:RC4
+RC4_options 801 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC4
BIO_f_null 802 3_0_0 EXIST::FUNCTION:
EC_GROUP_set_curve_name 803 3_0_0 EXIST::FUNCTION:EC
d2i_PBE2PARAM 804 3_0_0 EXIST::FUNCTION:
@@ -1029,7 +1029,7 @@ BN_GF2m_mod_exp 1055 3_0_0 EXIST::FUNCTION:EC2M
OPENSSL_buf2hexstr 1056 3_0_0 EXIST::FUNCTION:
DES_encrypt2 1057 3_0_0 EXIST::FUNCTION:DES
DH_up_ref 1058 3_0_0 EXIST::FUNCTION:DH
-RC2_ofb64_encrypt 1059 3_0_0 EXIST::FUNCTION:RC2
+RC2_ofb64_encrypt 1059 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
PKCS12_pbe_crypt 1060 3_0_0 EXIST::FUNCTION:
ASIdentifiers_free 1061 3_0_0 EXIST::FUNCTION:RFC3779
X509_VERIFY_PARAM_get0 1062 3_0_0 EXIST::FUNCTION:
@@ -1097,7 +1097,7 @@ PKCS8_PRIV_KEY_INFO_it 1123 3_0_0 EXIST::FUNCTION:
RSA_OAEP_PARAMS_free 1124 3_0_0 EXIST::FUNCTION:RSA
ASN1_item_new 1125 3_0_0 EXIST::FUNCTION:
CRYPTO_cts128_encrypt 1126 3_0_0 EXIST::FUNCTION:
-RC2_encrypt 1127 3_0_0 EXIST::FUNCTION:RC2
+RC2_encrypt 1127 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
PEM_write 1128 3_0_0 EXIST::FUNCTION:STDIO
EVP_CIPHER_meth_get_get_asn1_params 1129 3_0_0 EXIST::FUNCTION:
i2d_OCSP_RESPBYTES 1130 3_0_0 EXIST::FUNCTION:OCSP
@@ -1238,7 +1238,7 @@ HMAC_CTX_copy 1266 3_0_0 EXIST::FUNCTION:
CRYPTO_gcm128_init 1267 3_0_0 EXIST::FUNCTION:
i2d_X509_CINF 1268 3_0_0 EXIST::FUNCTION:
X509_REVOKED_delete_ext 1269 3_0_0 EXIST::FUNCTION:
-RC5_32_cfb64_encrypt 1270 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_cfb64_encrypt 1270 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
TS_REQ_set_cert_req 1271 3_0_0 EXIST::FUNCTION:TS
TXT_DB_get_by_index 1272 3_0_0 EXIST::FUNCTION:
X509_check_ca 1273 3_0_0 EXIST::FUNCTION:
@@ -1278,7 +1278,7 @@ UI_get_result_maxsize 1306 3_0_0 EXIST::FUNCTION:
PBEPARAM_it 1307 3_0_0 EXIST::FUNCTION:
TS_ACCURACY_set_seconds 1308 3_0_0 EXIST::FUNCTION:TS
UI_get0_action_string 1309 3_0_0 EXIST::FUNCTION:
-RC2_decrypt 1310 3_0_0 EXIST::FUNCTION:RC2
+RC2_decrypt 1310 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
OPENSSL_atexit 1311 3_0_0 EXIST::FUNCTION:
CMS_add_standard_smimecap 1312 3_0_0 EXIST::FUNCTION:CMS
PKCS7_add_attrib_content_type 1313 3_0_0 EXIST::FUNCTION:
@@ -1557,7 +1557,7 @@ UI_get0_output_string 1591 3_0_0 EXIST::FUNCTION:
ERR_get_error_line_data 1592 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
CTLOG_get0_name 1593 3_0_0 EXIST::FUNCTION:CT
ASN1_TBOOLEAN_it 1594 3_0_0 EXIST::FUNCTION:
-RC2_set_key 1595 3_0_0 EXIST::FUNCTION:RC2
+RC2_set_key 1595 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
X509_REVOKED_get_ext_by_NID 1596 3_0_0 EXIST::FUNCTION:
RSA_padding_add_none 1597 3_0_0 EXIST::FUNCTION:RSA
EVP_rc5_32_12_16_cbc 1599 3_0_0 EXIST::FUNCTION:RC5
@@ -1673,7 +1673,7 @@ UI_dup_verify_string 1711 3_0_0 EXIST::FUNCTION:
d2i_PKCS7_bio 1712 3_0_0 EXIST::FUNCTION:
ENGINE_set_default_digests 1713 3_0_0 EXIST::FUNCTION:ENGINE
i2d_PublicKey 1714 3_0_0 EXIST::FUNCTION:
-RC5_32_set_key 1715 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_set_key 1715 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
AES_unwrap_key 1716 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
EVP_Cipher 1717 3_0_0 EXIST::FUNCTION:
AES_set_decrypt_key 1718 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
@@ -1692,7 +1692,7 @@ CMS_unsigned_get_attr 1730 3_0_0 EXIST::FUNCTION:CMS
EVP_aes_256_cbc 1731 3_0_0 EXIST::FUNCTION:
X509_check_ip_asc 1732 3_0_0 EXIST::FUNCTION:
PEM_write_bio_X509_AUX 1733 3_0_0 EXIST::FUNCTION:
-RC2_cbc_encrypt 1734 3_0_0 EXIST::FUNCTION:RC2
+RC2_cbc_encrypt 1734 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC2
TS_MSG_IMPRINT_new 1735 3_0_0 EXIST::FUNCTION:TS
EVP_ENCODE_CTX_new 1736 3_0_0 EXIST::FUNCTION:
BIO_f_base64 1737 3_0_0 EXIST::FUNCTION:
@@ -1771,7 +1771,7 @@ OPENSSL_LH_delete 1812 3_0_0 EXIST::FUNCTION:
TS_STATUS_INFO_dup 1813 3_0_0 EXIST::FUNCTION:TS
X509v3_addr_get_range 1814 3_0_0 EXIST::FUNCTION:RFC3779
X509_EXTENSION_get_data 1815 3_0_0 EXIST::FUNCTION:
-RC5_32_encrypt 1816 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_encrypt 1816 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
DIST_POINT_set_dpname 1817 3_0_0 EXIST::FUNCTION:
BIO_sock_info 1818 3_0_0 EXIST::FUNCTION:SOCK
OPENSSL_hexstr2buf 1819 3_0_0 EXIST::FUNCTION:
@@ -1946,7 +1946,7 @@ GENERAL_NAME_it 1991 3_0_0 EXIST::FUNCTION:
EVP_des_ede_ecb 1992 3_0_0 EXIST::FUNCTION:DES
i2d_CRL_DIST_POINTS 1993 3_0_0 EXIST::FUNCTION:
PEM_write_bio_X509_REQ_NEW 1994 3_0_0 EXIST::FUNCTION:
-RC5_32_ofb64_encrypt 1995 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_ofb64_encrypt 1995 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
i2d_PKCS7 1996 3_0_0 EXIST::FUNCTION:
BN_mod_lshift_quick 1997 3_0_0 EXIST::FUNCTION:
DIST_POINT_NAME_it 1998 3_0_0 EXIST::FUNCTION:
@@ -2694,7 +2694,7 @@ X509_REQ_to_X509 2750 3_0_0 EXIST::FUNCTION:
EVP_aes_192_wrap_pad 2751 3_0_0 EXIST::FUNCTION:
PKCS7_SIGN_ENVELOPE_new 2752 3_0_0 EXIST::FUNCTION:
TS_REQ_get_policy_id 2753 3_0_0 EXIST::FUNCTION:TS
-RC5_32_cbc_encrypt 2754 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_cbc_encrypt 2754 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
BN_is_zero 2755 3_0_0 EXIST::FUNCTION:
CT_POLICY_EVAL_CTX_new 2756 3_0_0 EXIST::FUNCTION:CT
NETSCAPE_SPKI_it 2757 3_0_0 EXIST::FUNCTION:
@@ -2856,7 +2856,7 @@ X509_STORE_CTX_free 2917 3_0_0 EXIST::FUNCTION:
AUTHORITY_KEYID_it 2918 3_0_0 EXIST::FUNCTION:
X509V3_get_value_int 2919 3_0_0 EXIST::FUNCTION:
ASN1_UTCTIME_set_string 2920 3_0_0 EXIST::FUNCTION:
-RC5_32_decrypt 2921 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_decrypt 2921 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
i2d_X509_REQ_INFO 2922 3_0_0 EXIST::FUNCTION:
EVP_des_cfb1 2923 3_0_0 EXIST::FUNCTION:DES
OBJ_NAME_cleanup 2924 3_0_0 EXIST::FUNCTION:
@@ -2960,7 +2960,7 @@ ASN1_TYPE_unpack_sequence 3024 3_0_0 EXIST::FUNCTION:
X509_CRL_sign_ctx 3025 3_0_0 EXIST::FUNCTION:
X509_STORE_add_crl 3026 3_0_0 EXIST::FUNCTION:
PEM_write_RSAPrivateKey 3027 3_0_0 EXIST::FUNCTION:RSA,STDIO
-RC4_set_key 3028 3_0_0 EXIST::FUNCTION:RC4
+RC4_set_key 3028 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC4
EVP_CIPHER_CTX_cipher 3029 3_0_0 EXIST::FUNCTION:
PEM_write_bio_PKCS8PrivateKey_nid 3030 3_0_0 EXIST::FUNCTION:
BN_MONT_CTX_new 3031 3_0_0 EXIST::FUNCTION:
@@ -3477,7 +3477,7 @@ BN_dec2bn 3549 3_0_0 EXIST::FUNCTION:
CMS_decrypt 3550 3_0_0 EXIST::FUNCTION:CMS
BN_mpi2bn 3551 3_0_0 EXIST::FUNCTION:
EVP_aes_128_cfb128 3552 3_0_0 EXIST::FUNCTION:
-RC5_32_ecb_encrypt 3554 3_0_0 EXIST::FUNCTION:RC5
+RC5_32_ecb_encrypt 3554 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RC5
EVP_CIPHER_meth_new 3555 3_0_0 EXIST::FUNCTION:
i2d_RSA_OAEP_PARAMS 3556 3_0_0 EXIST::FUNCTION:RSA
SXNET_get_id_ulong 3557 3_0_0 EXIST::FUNCTION:
More information about the openssl-commits
mailing list