diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbe.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p5_pbe.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c index a7fc9aa19f..204e818286 100644 --- a/src/lib/libcrypto/asn1/p5_pbe.c +++ b/src/lib/libcrypto/asn1/p5_pbe.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p5_pbe.c,v 1.24 2023/07/05 21:23:36 beck Exp $ */ | 1 | /* $OpenBSD: p5_pbe.c,v 1.25 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. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -95,28 +95,24 @@ d2i_PBEPARAM(PBEPARAM **a, const unsigned char **in, long len) | |||
95 | return (PBEPARAM *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 95 | return (PBEPARAM *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
96 | &PBEPARAM_it); | 96 | &PBEPARAM_it); |
97 | } | 97 | } |
98 | LCRYPTO_ALIAS(d2i_PBEPARAM); | ||
99 | 98 | ||
100 | int | 99 | int |
101 | i2d_PBEPARAM(PBEPARAM *a, unsigned char **out) | 100 | i2d_PBEPARAM(PBEPARAM *a, unsigned char **out) |
102 | { | 101 | { |
103 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PBEPARAM_it); | 102 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PBEPARAM_it); |
104 | } | 103 | } |
105 | LCRYPTO_ALIAS(i2d_PBEPARAM); | ||
106 | 104 | ||
107 | PBEPARAM * | 105 | PBEPARAM * |
108 | PBEPARAM_new(void) | 106 | PBEPARAM_new(void) |
109 | { | 107 | { |
110 | return (PBEPARAM *)ASN1_item_new(&PBEPARAM_it); | 108 | return (PBEPARAM *)ASN1_item_new(&PBEPARAM_it); |
111 | } | 109 | } |
112 | LCRYPTO_ALIAS(PBEPARAM_new); | ||
113 | 110 | ||
114 | void | 111 | void |
115 | PBEPARAM_free(PBEPARAM *a) | 112 | PBEPARAM_free(PBEPARAM *a) |
116 | { | 113 | { |
117 | ASN1_item_free((ASN1_VALUE *)a, &PBEPARAM_it); | 114 | ASN1_item_free((ASN1_VALUE *)a, &PBEPARAM_it); |
118 | } | 115 | } |
119 | LCRYPTO_ALIAS(PBEPARAM_free); | ||
120 | 116 | ||
121 | 117 | ||
122 | /* Set an algorithm identifier for a PKCS#5 PBE algorithm */ | 118 | /* Set an algorithm identifier for a PKCS#5 PBE algorithm */ |
@@ -169,7 +165,6 @@ PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter, | |||
169 | ASN1_STRING_free(pbe_str); | 165 | ASN1_STRING_free(pbe_str); |
170 | return 0; | 166 | return 0; |
171 | } | 167 | } |
172 | LCRYPTO_ALIAS(PKCS5_pbe_set0_algor); | ||
173 | 168 | ||
174 | /* Return an algorithm identifier for a PKCS#5 PBE algorithm */ | 169 | /* Return an algorithm identifier for a PKCS#5 PBE algorithm */ |
175 | 170 | ||
@@ -189,4 +184,3 @@ PKCS5_pbe_set(int alg, int iter, const unsigned char *salt, int saltlen) | |||
189 | X509_ALGOR_free(ret); | 184 | X509_ALGOR_free(ret); |
190 | return NULL; | 185 | return NULL; |
191 | } | 186 | } |
192 | LCRYPTO_ALIAS(PKCS5_pbe_set); | ||