diff options
| author | Pauli <paul.dale@oracle.com> | 2020-01-09 01:16:21 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-01-12 03:02:17 +0100 |
| commit | 58e1f3d6d4046355df272af0261179bf9999d473 (patch) | |
| tree | 40d8b94b709ddf1c820cb9fd1b17d8567896e1d1 /apps | |
| parent | md2: fix preprocessor indentation (diff) | |
| download | openssl-58e1f3d6d4046355df272af0261179bf9999d473.tar.xz openssl-58e1f3d6d4046355df272af0261179bf9999d473.zip | |
Deprecate the low level MD2 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 'apps')
| -rw-r--r-- | apps/speed.c | 8 | ||||
| -rw-r--r-- | apps/version.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/apps/speed.c b/apps/speed.c index a600116483..244662054c 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -329,7 +329,7 @@ static const char *names[ALGOR_NUM] = { /* list of configured algorithm (remaining), with some few alias */ static const OPT_PAIR doit_choices[] = { -#ifndef OPENSSL_NO_MD2 +#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0) {"md2", D_MD2}, #endif #ifndef OPENSSL_NO_MDC2 @@ -570,7 +570,7 @@ static unsigned int testnum; /* Nb of iterations to do per algorithm and key-size */ static long c[ALGOR_NUM][SIZE_NUM]; -#ifndef OPENSSL_NO_MD2 +#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0) static int EVP_Digest_MD2_loop(void *args) { loopargs_t *tempargs = *(loopargs_t **) args; @@ -2241,7 +2241,7 @@ int speed_main(int argc, char **argv) signal(SIGALRM, alarmed); #endif /* SIGALRM */ -#ifndef OPENSSL_NO_MD2 +#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (doit[D_MD2]) { for (testnum = 0; testnum < size_num; testnum++) { print_message(names[D_MD2], c[D_MD2][testnum], lengths[testnum], @@ -3487,7 +3487,7 @@ int speed_main(int argc, char **argv) printf("built on: %s\n", OpenSSL_version(OPENSSL_BUILT_ON)); printf("options:"); printf("%s ", BN_options()); -#ifndef OPENSSL_NO_MD2 +#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0) printf("%s ", MD2_options()); #endif #ifndef OPENSSL_NO_RC4 diff --git a/apps/version.c b/apps/version.c index 694013e110..09d903d844 100644 --- a/apps/version.c +++ b/apps/version.c @@ -129,9 +129,6 @@ opthelp: if (options) { printf("options: "); printf(" %s", BN_options()); -#ifndef OPENSSL_NO_MD2 - printf(" %s", MD2_options()); -#endif #ifndef OPENSSL_NO_RC4 printf(" %s", RC4_options()); #endif |