summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12
diff options
context:
space:
mode:
authortb <>2021-12-12 21:30:14 +0000
committertb <>2021-12-12 21:30:14 +0000
commitc1ae4c3a2dcb48029aaea219cb195e9dfe1d093d (patch)
tree68f1da62b9246ae5a21e41ac2ee05ee8307cfa6f /src/lib/libcrypto/pkcs12
parenta0b1347b1dec62a1a5e864ed59314d2e9b42e15b (diff)
downloadopenbsd-c1ae4c3a2dcb48029aaea219cb195e9dfe1d093d.tar.gz
openbsd-c1ae4c3a2dcb48029aaea219cb195e9dfe1d093d.tar.bz2
openbsd-c1ae4c3a2dcb48029aaea219cb195e9dfe1d093d.zip
Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump. ok inoguchi
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_decr.c4
-rw-r--r--src/lib/libcrypto/pkcs12/p12_key.c4
-rw-r--r--src/lib/libcrypto/pkcs12/p12_mutl.c3
3 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index 8ac7f17cfc..c352ba565c 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_decr.c,v 1.20 2021/07/09 14:08:00 tb Exp $ */ 1/* $OpenBSD: p12_decr.c,v 1.21 2021/12/12 21:30:14 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 */
@@ -62,6 +62,8 @@
62#include <openssl/err.h> 62#include <openssl/err.h>
63#include <openssl/pkcs12.h> 63#include <openssl/pkcs12.h>
64 64
65#include "evp_locl.h"
66
65/* Encrypt/Decrypt a buffer based on password and algor, result in a 67/* Encrypt/Decrypt a buffer based on password and algor, result in a
66 * malloc'ed buffer 68 * malloc'ed buffer
67 */ 69 */
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
index 2887948144..38d25d2f6b 100644
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ b/src/lib/libcrypto/pkcs12/p12_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_key.c,v 1.27 2021/07/09 14:08:00 tb Exp $ */ 1/* $OpenBSD: p12_key.c,v 1.28 2021/12/12 21:30:14 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 */
@@ -63,6 +63,8 @@
63#include <openssl/err.h> 63#include <openssl/err.h>
64#include <openssl/pkcs12.h> 64#include <openssl/pkcs12.h>
65 65
66#include "evp_locl.h"
67
66/* PKCS12 compatible key/IV generation */ 68/* PKCS12 compatible key/IV generation */
67#ifndef min 69#ifndef min
68#define min(a,b) ((a) < (b) ? (a) : (b)) 70#define min(a,b) ((a) < (b) ? (a) : (b))
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index aa363747b3..f3a6ea3ba3 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.26 2021/12/12 21:27:38 tb Exp $ */ 1/* $OpenBSD: p12_mutl.c,v 1.27 2021/12/12 21:30:14 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,7 @@
68#include <openssl/hmac.h> 68#include <openssl/hmac.h>
69#include <openssl/pkcs12.h> 69#include <openssl/pkcs12.h>
70 70
71#include "evp_locl.h"
71#include "hmac_local.h" 72#include "hmac_local.h"
72#include "x509_lcl.h" 73#include "x509_lcl.h"
73 74