summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/p5_pbev2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbev2.c')
-rw-r--r--src/lib/libcrypto/asn1/p5_pbev2.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index 0fab422da9..8b6d1929b3 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.29 2023/07/05 21:23:36 beck Exp $ */ 1/* $OpenBSD: p5_pbev2.c,v 1.30 2023/07/07 19:37:52 beck 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 */
@@ -97,28 +97,24 @@ d2i_PBE2PARAM(PBE2PARAM **a, const unsigned char **in, long len)
97 return (PBE2PARAM *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 97 return (PBE2PARAM *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
98 &PBE2PARAM_it); 98 &PBE2PARAM_it);
99} 99}
100LCRYPTO_ALIAS(d2i_PBE2PARAM);
101 100
102int 101int
103i2d_PBE2PARAM(PBE2PARAM *a, unsigned char **out) 102i2d_PBE2PARAM(PBE2PARAM *a, unsigned char **out)
104{ 103{
105 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PBE2PARAM_it); 104 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PBE2PARAM_it);
106} 105}
107LCRYPTO_ALIAS(i2d_PBE2PARAM);
108 106
109PBE2PARAM * 107PBE2PARAM *
110PBE2PARAM_new(void) 108PBE2PARAM_new(void)
111{ 109{
112 return (PBE2PARAM *)ASN1_item_new(&PBE2PARAM_it); 110 return (PBE2PARAM *)ASN1_item_new(&PBE2PARAM_it);
113} 111}
114LCRYPTO_ALIAS(PBE2PARAM_new);
115 112
116void 113void
117PBE2PARAM_free(PBE2PARAM *a) 114PBE2PARAM_free(PBE2PARAM *a)
118{ 115{
119 ASN1_item_free((ASN1_VALUE *)a, &PBE2PARAM_it); 116 ASN1_item_free((ASN1_VALUE *)a, &PBE2PARAM_it);
120} 117}
121LCRYPTO_ALIAS(PBE2PARAM_free);
122 118
123static const ASN1_TEMPLATE PBKDF2PARAM_seq_tt[] = { 119static const ASN1_TEMPLATE PBKDF2PARAM_seq_tt[] = {
124 { 120 {
@@ -161,28 +157,24 @@ d2i_PBKDF2PARAM(PBKDF2PARAM **a, const unsigned char **in, long len)
161 return (PBKDF2PARAM *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 157 return (PBKDF2PARAM *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
162 &PBKDF2PARAM_it); 158 &PBKDF2PARAM_it);
163} 159}
164LCRYPTO_ALIAS(d2i_PBKDF2PARAM);
165 160
166int 161int
167i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **out) 162i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **out)
168{ 163{
169 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PBKDF2PARAM_it); 164 return ASN1_item_i2d((ASN1_VALUE *)a, out, &PBKDF2PARAM_it);
170} 165}
171LCRYPTO_ALIAS(i2d_PBKDF2PARAM);
172 166
173PBKDF2PARAM * 167PBKDF2PARAM *
174PBKDF2PARAM_new(void) 168PBKDF2PARAM_new(void)
175{ 169{
176 return (PBKDF2PARAM *)ASN1_item_new(&PBKDF2PARAM_it); 170 return (PBKDF2PARAM *)ASN1_item_new(&PBKDF2PARAM_it);
177} 171}
178LCRYPTO_ALIAS(PBKDF2PARAM_new);
179 172
180void 173void
181PBKDF2PARAM_free(PBKDF2PARAM *a) 174PBKDF2PARAM_free(PBKDF2PARAM *a)
182{ 175{
183 ASN1_item_free((ASN1_VALUE *)a, &PBKDF2PARAM_it); 176 ASN1_item_free((ASN1_VALUE *)a, &PBKDF2PARAM_it);
184} 177}
185LCRYPTO_ALIAS(PBKDF2PARAM_free);
186 178
187/* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm: 179/* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm:
188 * yes I know this is horrible! 180 * yes I know this is horrible!
@@ -293,7 +285,6 @@ PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
293 285
294 return NULL; 286 return NULL;
295} 287}
296LCRYPTO_ALIAS(PKCS5_pbe2_set_iv);
297 288
298X509_ALGOR * 289X509_ALGOR *
299PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, unsigned char *salt, 290PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
@@ -301,7 +292,6 @@ PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
301{ 292{
302 return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1); 293 return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1);
303} 294}
304LCRYPTO_ALIAS(PKCS5_pbe2_set);
305 295
306X509_ALGOR * 296X509_ALGOR *
307PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid, 297PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid,
@@ -382,4 +372,3 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid,
382 X509_ALGOR_free(keyfunc); 372 X509_ALGOR_free(keyfunc);
383 return NULL; 373 return NULL;
384} 374}
385LCRYPTO_ALIAS(PKCS5_pbkdf2_set);