From a113f18ef7da93ca9ef356ee9bc03f5ff36db869 Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Sun, 13 Jul 2014 22:31:42 +0000
Subject: [PATCH] Rename various configuration handling functions.

Requested by and discussed with tedu@.
---
 lib/libressl/ressl.h        | 15 ++++++++-------
 lib/libressl/ressl_config.c | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/libressl/ressl.h b/lib/libressl/ressl.h
index d044cd4fdc1..a1d220028f2 100644
--- a/lib/libressl/ressl.h
+++ b/lib/libressl/ressl.h
@@ -27,13 +27,14 @@ const char *ressl_error(struct ressl *ctx);
 struct ressl_config *ressl_config_new(void);
 void ressl_config_free(struct ressl_config *config);
 
-void ressl_config_ca_file(struct ressl_config *config, char *ca_file);
-void ressl_config_ca_path(struct ressl_config *config, char *ca_path);
-void ressl_config_ciphers(struct ressl_config *config, char *ciphers);
-void ressl_config_verify_depth(struct ressl_config *config, int verify_depth);
-
-void ressl_config_insecure(struct ressl_config *config);
-void ressl_config_secure(struct ressl_config *config);
+void ressl_config_set_ca_file(struct ressl_config *config, char *ca_file);
+void ressl_config_set_ca_path(struct ressl_config *config, char *ca_path);
+void ressl_config_set_ciphers(struct ressl_config *config, char *ciphers);
+void ressl_config_set_verify_depth(struct ressl_config *config,
+    int verify_depth);
+
+void ressl_config_insecure_no_verify(struct ressl_config *config);
+void ressl_config_verify(struct ressl_config *config);
 
 struct ressl *ressl_new(struct ressl_config *config);
 void ressl_reset(struct ressl *ctx);
diff --git a/lib/libressl/ressl_config.c b/lib/libressl/ressl_config.c
index 3932b96addd..ebca78e413a 100644
--- a/lib/libressl/ressl_config.c
+++ b/lib/libressl/ressl_config.c
@@ -51,37 +51,37 @@ ressl_config_free(struct ressl_config *config)
 }
 
 void
-ressl_config_ca_file(struct ressl_config *config, char *ca_file)
+ressl_config_set_ca_file(struct ressl_config *config, char *ca_file)
 {
 	config->ca_file = ca_file;
 }
 
 void
-ressl_config_ca_path(struct ressl_config *config, char *ca_path)
+ressl_config_set_ca_path(struct ressl_config *config, char *ca_path)
 {
 	config->ca_path = ca_path;
 }
 
 void
-ressl_config_ciphers(struct ressl_config *config, char *ciphers)
+ressl_config_set_ciphers(struct ressl_config *config, char *ciphers)
 {
 	config->ciphers = ciphers;
 }
 
 void
-ressl_config_insecure(struct ressl_config *config)
+ressl_config_insecure_no_verify(struct ressl_config *config)
 {
 	config->verify = 0;
 }
 
 void
-ressl_config_secure(struct ressl_config *config)
+ressl_config_verify(struct ressl_config *config)
 {
 	config->verify = 1;
 }
 
 void
-ressl_config_verify_depth(struct ressl_config *config, int verify_depth)
+ressl_config_set_verify_depth(struct ressl_config *config, int verify_depth)
 {
 	config->verify_depth = verify_depth;
 }
-- 
2.20.1