diff options
author | tb <> | 2024-01-13 11:48:16 +0000 |
---|---|---|
committer | tb <> | 2024-01-13 11:48:16 +0000 |
commit | 0b0d2fb3ead1da1ee4092b73cbcb12a10ca570ef (patch) | |
tree | 598f1a846fe212807c690973cd4cd4d035de0061 /src | |
parent | b494b36c9a1c2bbc789e8fb3decb0d1b304c12d3 (diff) | |
download | openbsd-0b0d2fb3ead1da1ee4092b73cbcb12a10ca570ef.tar.gz openbsd-0b0d2fb3ead1da1ee4092b73cbcb12a10ca570ef.tar.bz2 openbsd-0b0d2fb3ead1da1ee4092b73cbcb12a10ca570ef.zip |
Neuter EVP_add_{cipher,digest}()
This makes them noops. They are used in the wild for adding ciphers
that are always added by the library init code. This is a historic
leftover.
This removes the last (and only ever) calls to check_defer().
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/evp/names.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c index f43534194a..6ef061a2cb 100644 --- a/src/lib/libcrypto/evp/names.c +++ b/src/lib/libcrypto/evp/names.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: names.c,v 1.26 2024/01/13 11:45:03 tb Exp $ */ | 1 | /* $OpenBSD: names.c,v 1.27 2024/01/13 11:48:16 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -70,22 +70,12 @@ void check_defer(int nid); | |||
70 | int | 70 | int |
71 | EVP_add_cipher(const EVP_CIPHER *c) | 71 | EVP_add_cipher(const EVP_CIPHER *c) |
72 | { | 72 | { |
73 | if (c == NULL) | ||
74 | return 0; | ||
75 | |||
76 | check_defer(c->nid); | ||
77 | |||
78 | return 1; | 73 | return 1; |
79 | } | 74 | } |
80 | 75 | ||
81 | int | 76 | int |
82 | EVP_add_digest(const EVP_MD *md) | 77 | EVP_add_digest(const EVP_MD *md) |
83 | { | 78 | { |
84 | check_defer(md->type); | ||
85 | |||
86 | if (md->pkey_type && md->type != md->pkey_type) | ||
87 | check_defer(md->pkey_type); | ||
88 | |||
89 | return 1; | 79 | return 1; |
90 | } | 80 | } |
91 | 81 | ||