summaryrefslogtreecommitdiff
path: root/src/lib/libressl/ressl_internal.h
diff options
context:
space:
mode:
authorjsing <>2014-08-06 01:54:01 +0000
committerjsing <>2014-08-06 01:54:01 +0000
commit533b9cb6fe0524c31a25d947f525c859b4c84ff9 (patch)
tree4078c1ca5f3aed03285687c8b675da3f2275e5c9 /src/lib/libressl/ressl_internal.h
parentae244416d2459b82c672fe5c98ec0ee712a706d1 (diff)
downloadopenbsd-533b9cb6fe0524c31a25d947f525c859b4c84ff9.tar.gz
openbsd-533b9cb6fe0524c31a25d947f525c859b4c84ff9.tar.bz2
openbsd-533b9cb6fe0524c31a25d947f525c859b4c84ff9.zip
Add support for loading the public/private key from memory, rather than
directly from file.
Diffstat (limited to 'src/lib/libressl/ressl_internal.h')
-rw-r--r--src/lib/libressl/ressl_internal.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libressl/ressl_internal.h b/src/lib/libressl/ressl_internal.h
index b7158bce9a..3f667526ad 100644
--- a/src/lib/libressl/ressl_internal.h
+++ b/src/lib/libressl/ressl_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ressl_internal.h,v 1.8 2014/08/05 12:46:16 jsing Exp $ */ 1/* $OpenBSD: ressl_internal.h,v 1.9 2014/08/06 01:54:01 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -29,8 +29,12 @@ struct ressl_config {
29 const char *ca_file; 29 const char *ca_file;
30 const char *ca_path; 30 const char *ca_path;
31 const char *cert_file; 31 const char *cert_file;
32 char *cert_mem;
33 size_t cert_len;
32 const char *ciphers; 34 const char *ciphers;
33 const char *key_file; 35 const char *key_file;
36 char *key_mem;
37 size_t key_len;
34 int verify; 38 int verify;
35 int verify_depth; 39 int verify_depth;
36}; 40};