diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-03-26 05:39:48 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-03-26 05:39:48 +0000 |
| commit | b4536c68625c64fd37ae5bd170898ea0a8a5fb47 (patch) | |
| tree | bfad660b128df10b51ea5ff3b64f83b772d63e28 | |
| parent | 82cbc432bf2de533210fc821c9f8e1cf833af06c (diff) | |
PKCS5_pbe2_set_iv() can be local to p5_pbev2
quoth the muppet "yes I know this is horrible!"
| -rw-r--r-- | lib/libcrypto/asn1/p5_pbev2.c | 5 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509_local.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/libcrypto/asn1/p5_pbev2.c b/lib/libcrypto/asn1/p5_pbev2.c index ebb20c296fc..bed85fca7f6 100644 --- a/lib/libcrypto/asn1/p5_pbev2.c +++ b/lib/libcrypto/asn1/p5_pbev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_pbev2.c,v 1.32 2024/03/02 10:17:37 tb Exp $ */ +/* $OpenBSD: p5_pbev2.c,v 1.33 2024/03/26 05:39:47 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999-2004. */ @@ -65,7 +65,6 @@ #include <openssl/x509.h> #include "evp_local.h" -#include "x509_local.h" /* PKCS#5 v2.0 password based encryption structures */ @@ -183,7 +182,7 @@ PBKDF2PARAM_free(PBKDF2PARAM *a) * Extended version to allow application supplied PRF NID and IV. */ -X509_ALGOR * +static X509_ALGOR * PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt, int saltlen, unsigned char *aiv, int prf_nid) { diff --git a/lib/libcrypto/x509/x509_local.h b/lib/libcrypto/x509/x509_local.h index 83b57403d0f..73cc582d7bc 100644 --- a/lib/libcrypto/x509/x509_local.h +++ b/lib/libcrypto/x509/x509_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_local.h,v 1.22 2024/03/02 10:52:24 tb Exp $ */ +/* $OpenBSD: x509_local.h,v 1.23 2024/03/26 05:39:47 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2013. */ @@ -404,8 +404,6 @@ int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter, const unsigned char *salt, int saltlen); X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, unsigned char *salt, int saltlen); -X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, - unsigned char *salt, int saltlen, unsigned char *aiv, int prf_nid); X509_ALGOR *PKCS5_pbe_set(int alg, int iter, const unsigned char *salt, int saltlen); X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, |