diff options
| author | jsing <> | 2016-07-07 14:09:03 +0000 |
|---|---|---|
| committer | jsing <> | 2016-07-07 14:09:03 +0000 |
| commit | 264aec397e864b1312511d8a90f858c97ac5bb0c (patch) | |
| tree | 558129ff06641d4ec1f2b513a089cb94c039b319 /src/lib/libtls/tls_internal.h | |
| parent | 4ed8257afee9db6d69a7fc31eef1d52474e2ee0c (diff) | |
| download | openbsd-264aec397e864b1312511d8a90f858c97ac5bb0c.tar.gz openbsd-264aec397e864b1312511d8a90f858c97ac5bb0c.tar.bz2 openbsd-264aec397e864b1312511d8a90f858c97ac5bb0c.zip | |
Revert previous - it introduces problems with a common privsep use case.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libtls/tls_internal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h index b7a1530c96..886ee1151f 100644 --- a/src/lib/libtls/tls_internal.h +++ b/src/lib/libtls/tls_internal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_internal.h,v 1.30 2016/07/06 16:16:36 jsing Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.31 2016/07/07 14:09:03 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> |
| @@ -42,8 +42,10 @@ struct tls_error { | |||
| 42 | struct tls_keypair { | 42 | struct tls_keypair { |
| 43 | struct tls_keypair *next; | 43 | struct tls_keypair *next; |
| 44 | 44 | ||
| 45 | const char *cert_file; | ||
| 45 | char *cert_mem; | 46 | char *cert_mem; |
| 46 | size_t cert_len; | 47 | size_t cert_len; |
| 48 | const char *key_file; | ||
| 47 | char *key_mem; | 49 | char *key_mem; |
| 48 | size_t key_len; | 50 | size_t key_len; |
| 49 | }; | 51 | }; |
| @@ -51,6 +53,7 @@ struct tls_keypair { | |||
| 51 | struct tls_config { | 53 | struct tls_config { |
| 52 | struct tls_error error; | 54 | struct tls_error error; |
| 53 | 55 | ||
| 56 | const char *ca_file; | ||
| 54 | const char *ca_path; | 57 | const char *ca_path; |
| 55 | char *ca_mem; | 58 | char *ca_mem; |
| 56 | size_t ca_len; | 59 | size_t ca_len; |
