summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorreyk <>2014-09-28 14:45:48 +0000
committerreyk <>2014-09-28 14:45:48 +0000
commit86dd9a4f816c164cfa45e157991a16f15badb4a3 (patch)
tree2558f6bbdff94c43a1f9a53c84ba5f0ffa3ea8c0 /src/lib/libssl/ssl.h
parent091f5c3e6dfe57ebde616bd69bdc1866949e19a4 (diff)
downloadopenbsd-86dd9a4f816c164cfa45e157991a16f15badb4a3.tar.gz
openbsd-86dd9a4f816c164cfa45e157991a16f15badb4a3.tar.bz2
openbsd-86dd9a4f816c164cfa45e157991a16f15badb4a3.zip
Add a new API function SSL_CTX_use_certificate_chain() that allows to
read the PEM-encoded certificate chain from memory instead of a file. This idea is derived from an older implementation in relayd that was needed to use the function with a privep'ed process in a chroot. Now it is time to get it into LibreSSL to make the API more privsep- friendly and to make it available for other programs and the ressl library. ok jsing@ miod@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 3b948245f2..c7dd4259cc 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.65 2014/09/27 11:01:06 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.66 2014/09/28 14:45:48 reyk Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1530,6 +1530,7 @@ int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
1530int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type); 1530int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
1531int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type); 1531int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
1532int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */ 1532int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
1533int SSL_CTX_use_certificate_chain(SSL_CTX *ctx, void *buf, int len);
1533STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file); 1534STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
1534int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs, 1535int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
1535 const char *file); 1536 const char *file);