summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1
diff options
context:
space:
mode:
authortb <>2024-03-26 05:39:47 +0000
committertb <>2024-03-26 05:39:47 +0000
commitab4e5821937996e75dde9e321b00b070bcb895fe (patch)
tree057a176547b4ac6aed61bb2055fda80c9e557ebc /src/lib/libcrypto/asn1
parent55b0e6a268660db3dd97c93e5ffa45e7f3f4ffd3 (diff)
downloadopenbsd-ab4e5821937996e75dde9e321b00b070bcb895fe.tar.gz
openbsd-ab4e5821937996e75dde9e321b00b070bcb895fe.tar.bz2
openbsd-ab4e5821937996e75dde9e321b00b070bcb895fe.zip
PKCS5_pbe2_set_iv() can be local to p5_pbev2
quoth the muppet "yes I know this is horrible!"
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r--src/lib/libcrypto/asn1/p5_pbev2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index ebb20c296f..bed85fca7f 100644
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ b/src/lib/libcrypto/asn1/p5_pbev2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_pbev2.c,v 1.32 2024/03/02 10:17:37 tb Exp $ */ 1/* $OpenBSD: p5_pbev2.c,v 1.33 2024/03/26 05:39:47 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999-2004. 3 * project 1999-2004.
4 */ 4 */
@@ -65,7 +65,6 @@
65#include <openssl/x509.h> 65#include <openssl/x509.h>
66 66
67#include "evp_local.h" 67#include "evp_local.h"
68#include "x509_local.h"
69 68
70/* PKCS#5 v2.0 password based encryption structures */ 69/* PKCS#5 v2.0 password based encryption structures */
71 70
@@ -183,7 +182,7 @@ PBKDF2PARAM_free(PBKDF2PARAM *a)
183 * Extended version to allow application supplied PRF NID and IV. 182 * Extended version to allow application supplied PRF NID and IV.
184 */ 183 */
185 184
186X509_ALGOR * 185static X509_ALGOR *
187PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt, 186PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
188 int saltlen, unsigned char *aiv, int prf_nid) 187 int saltlen, unsigned char *aiv, int prf_nid)
189{ 188{