summaryrefslogtreecommitdiffstats
path: root/crypto/camellia
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-01-02 15:22:19 +0000
committerMatt Caswell <matt@openssl.org>2020-01-13 13:38:20 +0000
commit291850b473ef5d83ac7d90bdcd7f68d186515348 (patch)
treedc0e82c3982d8b6a83eda65abdd14b8e7ee829e6 /crypto/camellia
parent652fba9ef74c1fe92b80d178ada419057d873682 (diff)
Deprecate Low Level Camellia APIs
Applications should instead use the higher level EVP APIs, e.g. EVP_Encrypt*() and EVP_Decrypt*(). Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/10741)
Diffstat (limited to 'crypto/camellia')
-rw-r--r--crypto/camellia/camellia.c6
-rw-r--r--crypto/camellia/cmll_cbc.c6
-rw-r--r--crypto/camellia/cmll_cfb.c6
-rw-r--r--crypto/camellia/cmll_ctr.c6
-rw-r--r--crypto/camellia/cmll_ecb.c6
-rw-r--r--crypto/camellia/cmll_misc.c6
-rw-r--r--crypto/camellia/cmll_ofb.c6
7 files changed, 42 insertions, 0 deletions
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index cb285d05ed..fd493a8a83 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -39,6 +39,12 @@
* words reasonable performance even with not so modern compilers.
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/camellia.h>
#include "cmll_local.h"
#include <string.h>
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 14724bf226..92b729e02f 100644
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/camellia.h>
#include <openssl/modes.h>
diff --git a/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c
index 054f79c0dc..5b169a4f68 100644
--- a/crypto/camellia/cmll_cfb.c
+++ b/crypto/camellia/cmll_cfb.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/camellia.h>
#include <openssl/modes.h>
diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index bb36560c52..fa00150ec9 100644
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/camellia.h>
#include <openssl/modes.h>
diff --git a/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c
index 6a2c77750b..bb3e519d9e 100644
--- a/crypto/camellia/cmll_ecb.c
+++ b/crypto/camellia/cmll_ecb.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/camellia.h>
#include "cmll_local.h"
diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index b38fcc0491..3cc10c9977 100644
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/opensslv.h>
#include <openssl/camellia.h>
#include "cmll_local.h"
diff --git a/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c
index 9ef51299a7..0073a77c49 100644
--- a/crypto/camellia/cmll_ofb.c
+++ b/crypto/camellia/cmll_ofb.c
@@ -7,6 +7,12 @@
* https://www.openssl.org/source/license.html
*/
+/*
+ * Camellia low level APIs are deprecated for public use, but still ok for
+ * internal use.
+ */
+#include "internal/deprecated.h"
+
#include <openssl/camellia.h>
#include <openssl/modes.h>