diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libressl/ressl.h | 2 | ||||
-rw-r--r-- | src/lib/libressl/ressl_config.c | 24 | ||||
-rw-r--r-- | src/lib/libressl/ressl_internal.h | 3 |
3 files changed, 22 insertions, 7 deletions
diff --git a/src/lib/libressl/ressl.h b/src/lib/libressl/ressl.h index dc99368fe6..d4962f358b 100644 --- a/src/lib/libressl/ressl.h +++ b/src/lib/libressl/ressl.h | |||
@@ -29,7 +29,9 @@ void ressl_config_free(struct ressl_config *config); | |||
29 | 29 | ||
30 | void ressl_config_set_ca_file(struct ressl_config *config, char *ca_file); | 30 | void ressl_config_set_ca_file(struct ressl_config *config, char *ca_file); |
31 | void ressl_config_set_ca_path(struct ressl_config *config, char *ca_path); | 31 | void ressl_config_set_ca_path(struct ressl_config *config, char *ca_path); |
32 | void ressl_config_set_cert_file(struct ressl_config *config, char *cert_file); | ||
32 | void ressl_config_set_ciphers(struct ressl_config *config, char *ciphers); | 33 | void ressl_config_set_ciphers(struct ressl_config *config, char *ciphers); |
34 | void ressl_config_set_key_file(struct ressl_config *config, char *key_file); | ||
33 | void ressl_config_set_verify_depth(struct ressl_config *config, | 35 | void ressl_config_set_verify_depth(struct ressl_config *config, |
34 | int verify_depth); | 36 | int verify_depth); |
35 | 37 | ||
diff --git a/src/lib/libressl/ressl_config.c b/src/lib/libressl/ressl_config.c index 6205b6c559..1509b5aeba 100644 --- a/src/lib/libressl/ressl_config.c +++ b/src/lib/libressl/ressl_config.c | |||
@@ -63,21 +63,21 @@ ressl_config_set_ca_path(struct ressl_config *config, char *ca_path) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | void | 65 | void |
66 | ressl_config_set_ciphers(struct ressl_config *config, char *ciphers) | 66 | ressl_config_set_cert_file(struct ressl_config *config, char *cert_file) |
67 | { | 67 | { |
68 | config->ciphers = ciphers; | 68 | config->cert_file = cert_file; |
69 | } | 69 | } |
70 | 70 | ||
71 | void | 71 | void |
72 | ressl_config_insecure_no_verify(struct ressl_config *config) | 72 | ressl_config_set_ciphers(struct ressl_config *config, char *ciphers) |
73 | { | 73 | { |
74 | config->verify = 0; | 74 | config->ciphers = ciphers; |
75 | } | 75 | } |
76 | 76 | ||
77 | void | 77 | void |
78 | ressl_config_verify(struct ressl_config *config) | 78 | ressl_config_set_key_file(struct ressl_config *config, char *key_file) |
79 | { | 79 | { |
80 | config->verify = 1; | 80 | config->key_file = key_file; |
81 | } | 81 | } |
82 | 82 | ||
83 | void | 83 | void |
@@ -85,3 +85,15 @@ ressl_config_set_verify_depth(struct ressl_config *config, int verify_depth) | |||
85 | { | 85 | { |
86 | config->verify_depth = verify_depth; | 86 | config->verify_depth = verify_depth; |
87 | } | 87 | } |
88 | |||
89 | void | ||
90 | ressl_config_insecure_no_verify(struct ressl_config *config) | ||
91 | { | ||
92 | config->verify = 0; | ||
93 | } | ||
94 | |||
95 | void | ||
96 | ressl_config_verify(struct ressl_config *config) | ||
97 | { | ||
98 | config->verify = 1; | ||
99 | } | ||
diff --git a/src/lib/libressl/ressl_internal.h b/src/lib/libressl/ressl_internal.h index c234153587..c33d4cff2e 100644 --- a/src/lib/libressl/ressl_internal.h +++ b/src/lib/libressl/ressl_internal.h | |||
@@ -27,8 +27,9 @@ | |||
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 *cert_file; | ||
30 | const char *ciphers; | 31 | const char *ciphers; |
31 | const char *server_name; | 32 | const char *key_file; |
32 | int verify; | 33 | int verify; |
33 | int verify_depth; | 34 | int verify_depth; |
34 | }; | 35 | }; |