summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_mutl.c
diff options
context:
space:
mode:
authortb <>2021-11-01 20:53:08 +0000
committertb <>2021-11-01 20:53:08 +0000
commitf478d62658b61e2242dbf3575bf454f8c0f432b1 (patch)
treecbf2de4e6ef2a9e9d9281e6e60c30149cd648fd1 /src/lib/libcrypto/pkcs12/p12_mutl.c
parentb5a22e689a6f2534ae4b6d7fe4bf885792892295 (diff)
downloadopenbsd-f478d62658b61e2242dbf3575bf454f8c0f432b1.tar.gz
openbsd-f478d62658b61e2242dbf3575bf454f8c0f432b1.tar.bz2
openbsd-f478d62658b61e2242dbf3575bf454f8c0f432b1.zip
Move the now internal X.509-related structs into x509_lcl.h.
Garbage collect the now unused LIBRESSL_CRYPTO_INTERNAL and LIBRESSL_OPAQUE_X509. Include "x509_lcl.h" where needed and fix a couple of unnecessary reacharounds. ok jsing
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_mutl.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_mutl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index d45ab078fd..14ded8532d 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.24 2021/07/09 14:08:00 tb Exp $ */ 1/* $OpenBSD: p12_mutl.c,v 1.25 2021/11/01 20:53:08 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 */
@@ -68,6 +68,8 @@
68#include <openssl/hmac.h> 68#include <openssl/hmac.h>
69#include <openssl/pkcs12.h> 69#include <openssl/pkcs12.h>
70 70
71#include "x509_lcl.h"
72
71/* Generate a MAC */ 73/* Generate a MAC */
72int 74int
73PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, 75PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,