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