diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-09 10:37:28 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-12 12:02:17 +1000 |
| commit | 8ffb20ce05c13f137c169ebdfd11f702da82e9eb (patch) | |
| tree | 47f523e711260dcaa1a96600e742ece528cd785c /crypto/md4 | |
| parent | 01b0768d098698701c5491d8386019491a3dfdc7 (diff) | |
Deprecate the low level MD4 functions.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10790)
Diffstat (limited to 'crypto/md4')
| -rw-r--r-- | crypto/md4/build.info | 11 | ||||
| -rw-r--r-- | crypto/md4/md4_dgst.c | 6 | ||||
| -rw-r--r-- | crypto/md4/md4_one.c | 6 |
3 files changed, 21 insertions, 2 deletions
diff --git a/crypto/md4/build.info b/crypto/md4/build.info index 20846e0dce..7b36a0421e 100644 --- a/crypto/md4/build.info +++ b/crypto/md4/build.info @@ -1,3 +1,10 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=\ - md4_dgst.c md4_one.c + +SOURCE[../../libcrypto]=md4_dgst.c md4_one.c + +# When all deprecated symbols are removed, libcrypto doesn't export the +# MD4 functions, so we must include them directly in liblegacy.a +IF[{- $disabled{"deprecated"} + && (defined $config{"api"} && $config{"api"} >= 30000) -}] + SOURCE[../../providers/liblegacy.a]=md4_dgst.c md4_one.c +ENDIF diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c index cf95fbe622..531676a2af 100644 --- a/crypto/md4/md4_dgst.c +++ b/crypto/md4/md4_dgst.c @@ -7,6 +7,12 @@ * https://www.openssl.org/source/license.html */ +/* + * MD4 low level APIs are deprecated for public use, but still ok for + * internal use. + */ +#include "internal/deprecated.h" + #include <stdio.h> #include <openssl/opensslv.h> #include "md4_local.h" diff --git a/crypto/md4/md4_one.c b/crypto/md4/md4_one.c index 0383f9bc0d..25f8eb8bba 100644 --- a/crypto/md4/md4_one.c +++ b/crypto/md4/md4_one.c @@ -7,6 +7,12 @@ * https://www.openssl.org/source/license.html */ +/* + * MD4 low level APIs are deprecated for public use, but still ok for + * internal use. + */ +#include "internal/deprecated.h" + #include <stdio.h> #include <string.h> #include <openssl/md4.h> |