From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 8 Aug 2013 20:56:56 +0000 (+0200)
Subject: Rename *_SERVER_CERT_FORMAT to *_SERVER_CERT_FILE_FORMAT.
X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=commitdiff_plain;h=a8a45901f08376d0f4b8a6fe72d2cc90e2fc991e

Rename *_SERVER_CERT_FORMAT to *_SERVER_CERT_FILE_FORMAT.
---

diff --git a/src/tlsproxy.h b/src/tlsproxy.h
index 5c0940c..f93be46 100644
--- a/src/tlsproxy.h
+++ b/src/tlsproxy.h
@@ -43,11 +43,11 @@
 /* The server certificate for the given hostname is stored in
  * "./certificate-hostname-proxy.pem" - we use this for the connection to the
  * client. */
-#define PROXY_SERVER_CERT_FORMAT "./certificate-%s-proxy.pem"
+#define PROXY_SERVER_CERT_FILE_FORMAT "./certificate-%s-proxy.pem"
 /* The remote server certificate for the given hostname is stored in
  * "./certificate-hostname-proxy.pem" - we make sure the server sends this
  * certificate. */
-#define STORED_SERVER_CERT_FORMAT "./certificate-%s-server.pem"
+#define STORED_SERVER_CERT_FILE_FORMAT "./certificate-%s-server.pem"
 
 
 /* Proxy hostname and port if specified on the command line. */
diff --git a/src/verify.c b/src/verify.c
index 7031c28..855c5d2 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -237,13 +237,13 @@ static int get_certificate_path(const char *format,
 }
 
 int proxy_certificate_path(const char *hostname, char *path, size_t size) {
-    return get_certificate_path(PROXY_SERVER_CERT_FORMAT,
+    return get_certificate_path(PROXY_SERVER_CERT_FILE_FORMAT,
                                 hostname, path, size);
 }
 
 int server_certificate_file(FILE **file, const char *hostname,
                             char *path, size_t size) {
-    if (get_certificate_path(STORED_SERVER_CERT_FORMAT,
+    if (get_certificate_path(STORED_SERVER_CERT_FILE_FORMAT,
                              hostname, path, size) != 0) {
         LOG_PERROR(ERROR, "server_certificate_file(): failed to get path");
         return -1;