summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_key.c
diff options
context:
space:
mode:
authortb <>2021-12-12 21:30:14 +0000
committertb <>2021-12-12 21:30:14 +0000
commitb632ec4f99386efc52214c580c9f233748302224 (patch)
tree68f1da62b9246ae5a21e41ac2ee05ee8307cfa6f /src/lib/libcrypto/pkcs12/p12_key.c
parente6d34a52bf003f2e199023dc166779f5d25bfcff (diff)
downloadopenbsd-b632ec4f99386efc52214c580c9f233748302224.tar.gz
openbsd-b632ec4f99386efc52214c580c9f233748302224.tar.bz2
openbsd-b632ec4f99386efc52214c580c9f233748302224.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/p12_key.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_key.c4
1 files changed, 3 insertions, 1 deletions
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))