diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libressl/ressl.c | 10 | ||||
| -rw-r--r-- | src/lib/libressl/ressl_config.c | 10 | ||||
| -rw-r--r-- | src/lib/libressl/ressl_internal.h | 24 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/libressl/ressl.c b/src/lib/libressl/ressl.c index 08ec061bf5..bc257bd1a8 100644 --- a/src/lib/libressl/ressl.c +++ b/src/lib/libressl/ressl.c | |||
| @@ -50,16 +50,16 @@ ressl_error(struct ressl *ctx) | |||
| 50 | int | 50 | int |
| 51 | ressl_set_error(struct ressl *ctx, char *fmt, ...) | 51 | ressl_set_error(struct ressl *ctx, char *fmt, ...) |
| 52 | { | 52 | { |
| 53 | va_list ap; | 53 | va_list ap; |
| 54 | int rv; | 54 | int rv; |
| 55 | 55 | ||
| 56 | ctx->err = errno; | 56 | ctx->err = errno; |
| 57 | free(ctx->errmsg); | 57 | free(ctx->errmsg); |
| 58 | ctx->errmsg = NULL; | 58 | ctx->errmsg = NULL; |
| 59 | 59 | ||
| 60 | va_start(ap, fmt); | 60 | va_start(ap, fmt); |
| 61 | rv = vasprintf(&ctx->errmsg, fmt, ap); | 61 | rv = vasprintf(&ctx->errmsg, fmt, ap); |
| 62 | va_end(ap); | 62 | va_end(ap); |
| 63 | 63 | ||
| 64 | return (rv); | 64 | return (rv); |
| 65 | } | 65 | } |
diff --git a/src/lib/libressl/ressl_config.c b/src/lib/libressl/ressl_config.c index ebca78e413..6205b6c559 100644 --- a/src/lib/libressl/ressl_config.c +++ b/src/lib/libressl/ressl_config.c | |||
| @@ -24,11 +24,11 @@ | |||
| 24 | * Default configuration. | 24 | * Default configuration. |
| 25 | */ | 25 | */ |
| 26 | struct ressl_config ressl_config_default = { | 26 | struct ressl_config ressl_config_default = { |
| 27 | .ca_file = _PATH_SSL_CA_FILE, | 27 | .ca_file = _PATH_SSL_CA_FILE, |
| 28 | .ca_path = NULL, | 28 | .ca_path = NULL, |
| 29 | .ciphers = NULL, | 29 | .ciphers = NULL, |
| 30 | .verify = 1, | 30 | .verify = 1, |
| 31 | .verify_depth = 6, | 31 | .verify_depth = 6, |
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | struct ressl_config * | 34 | struct ressl_config * |
diff --git a/src/lib/libressl/ressl_internal.h b/src/lib/libressl/ressl_internal.h index 260ae8e1f9..c234153587 100644 --- a/src/lib/libressl/ressl_internal.h +++ b/src/lib/libressl/ressl_internal.h | |||
| @@ -25,28 +25,28 @@ | |||
| 25 | #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem" | 25 | #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem" |
| 26 | 26 | ||
| 27 | struct ressl_config { | 27 | struct ressl_config { |
| 28 | const char *ca_file; | 28 | const char *ca_file; |
| 29 | const char *ca_path; | 29 | const char *ca_path; |
| 30 | const char *ciphers; | 30 | const char *ciphers; |
| 31 | const char *server_name; | 31 | const char *server_name; |
| 32 | int verify; | 32 | int verify; |
| 33 | int verify_depth; | 33 | int verify_depth; |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | #define RESSL_CLIENT (1 << 0) | 36 | #define RESSL_CLIENT (1 << 0) |
| 37 | #define RESSL_SERVER (1 << 1) | 37 | #define RESSL_SERVER (1 << 1) |
| 38 | 38 | ||
| 39 | struct ressl { | 39 | struct ressl { |
| 40 | struct ressl_config *config; | 40 | struct ressl_config *config; |
| 41 | uint64_t flags; | 41 | uint64_t flags; |
| 42 | 42 | ||
| 43 | int err; | 43 | int err; |
| 44 | char *errmsg; | 44 | char *errmsg; |
| 45 | 45 | ||
| 46 | int socket; | 46 | int socket; |
| 47 | 47 | ||
| 48 | SSL *ssl_conn; | 48 | SSL *ssl_conn; |
| 49 | SSL_CTX *ssl_ctx; | 49 | SSL_CTX *ssl_ctx; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | struct ressl *ressl_new(void); | 52 | struct ressl *ressl_new(void); |
