summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_mutl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_mutl.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_mutl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index abfd9dd4b7..f0e6df9eb6 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_mutl.c,v 1.34 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: p12_mutl.c,v 1.35 2023/02/16 08:38:17 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. 3 * project 1999.
4 */ 4 */
@@ -78,7 +78,7 @@ PKCS12_mac_present(const PKCS12 *p12)
78{ 78{
79 return p12->mac != NULL; 79 return p12->mac != NULL;
80} 80}
81LCRYPTO_ALIAS(PKCS12_mac_present) 81LCRYPTO_ALIAS(PKCS12_mac_present);
82 82
83void 83void
84PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac, const X509_ALGOR **pmacalg, 84PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac, const X509_ALGOR **pmacalg,
@@ -106,7 +106,7 @@ PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac, const X509_ALGOR **pmacalg,
106 if (piter != NULL) 106 if (piter != NULL)
107 *piter = p12->mac->iter; 107 *piter = p12->mac->iter;
108} 108}
109LCRYPTO_ALIAS(PKCS12_get0_mac) 109LCRYPTO_ALIAS(PKCS12_get0_mac);
110 110
111/* Generate a MAC */ 111/* Generate a MAC */
112int 112int
@@ -169,7 +169,7 @@ PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
169 169
170 return ret; 170 return ret;
171} 171}
172LCRYPTO_ALIAS(PKCS12_gen_mac) 172LCRYPTO_ALIAS(PKCS12_gen_mac);
173 173
174/* Verify the mac */ 174/* Verify the mac */
175int 175int
@@ -191,7 +191,7 @@ PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen)
191 return 0; 191 return 0;
192 return 1; 192 return 1;
193} 193}
194LCRYPTO_ALIAS(PKCS12_verify_mac) 194LCRYPTO_ALIAS(PKCS12_verify_mac);
195 195
196/* Set a mac */ 196/* Set a mac */
197 197
@@ -219,7 +219,7 @@ PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *salt,
219 } 219 }
220 return 1; 220 return 1;
221} 221}
222LCRYPTO_ALIAS(PKCS12_set_mac) 222LCRYPTO_ALIAS(PKCS12_set_mac);
223 223
224/* Set up a mac structure */ 224/* Set up a mac structure */
225int 225int
@@ -259,5 +259,5 @@ PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
259 259
260 return 1; 260 return 1;
261} 261}
262LCRYPTO_ALIAS(PKCS12_setup_mac) 262LCRYPTO_ALIAS(PKCS12_setup_mac);
263#endif 263#endif