From 2f3cb396e73b2f4794c420e913037ca17b413032 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Thu, 22 Jan 2015 09:06:39 +0000
Subject: [PATCH] Add X509_STORE_load_mem() to load certificates from a memory
 buffer instead of disk.  OpenSSL didn't provide a built-in API from loading
 certificates in a chroot'ed process that doesn't have direct access to the
 files.  X509_STORE_load_mem() provides a new backend that will be used by
 libssl and libtls to implement such privsep-friendly functionality.

Adopted for LibreSSL based on older code from relayd (by pyr@ and myself)
With feedback and OK bluhm@
---
 src/lib/libcrypto/crypto/Makefile      | 4 ++--
 src/lib/libcrypto/crypto/shlib_version | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index f1e54659..84b8a6e9 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2014/12/03 22:14:38 bcook Exp $
+# $OpenBSD: Makefile,v 1.52 2015/01/22 09:06:39 reyk Exp $
 
 LIB=	crypto
 
@@ -256,7 +256,7 @@ SRCS+= x509_obj.c x509_req.c x509spki.c x509_vfy.c
 SRCS+= x509_set.c x509cset.c x509rset.c x509_err.c
 SRCS+= x509name.c x509_v3.c x509_ext.c x509_att.c
 SRCS+= x509type.c x509_lu.c x_all.c x509_txt.c
-SRCS+= x509_trs.c by_file.c by_dir.c x509_vpm.c
+SRCS+= x509_trs.c by_file.c by_dir.c by_mem.c x509_vpm.c
 
 # x509v3/
 SRCS+= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c
diff --git a/src/lib/libcrypto/crypto/shlib_version b/src/lib/libcrypto/crypto/shlib_version
index ac20b1fa..06b524da 100644
--- a/src/lib/libcrypto/crypto/shlib_version
+++ b/src/lib/libcrypto/crypto/shlib_version
@@ -1,2 +1,2 @@
 major=30
-minor=3
+minor=4