summaryrefslogtreecommitdiffstats
path: root/providers
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-01-14 09:38:09 +1000
committerPauli <paul.dale@oracle.com>2020-01-16 07:07:27 +1000
commita8fca7284a98ca58804e17ade92fadd7a62056ae (patch)
tree772f41a9e4b5058da12f0a0df765d75314519131 /providers
parentae856791e264fed50b8ee5070fcee7af11e7691c (diff)
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@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/10834)
Diffstat (limited to 'providers')
-rw-r--r--providers/implementations/ciphers/cipher_rc4.c6
-rw-r--r--providers/implementations/ciphers/cipher_rc4_hmac_md5.c6
-rw-r--r--providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c6
-rw-r--r--providers/implementations/ciphers/cipher_rc4_hw.c6
4 files changed, 24 insertions, 0 deletions
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,