Rename *_SERVER_CERT_FORMAT to *_SERVER_CERT_FILE_FORMAT.

diff --git a/src/tlsproxy.h b/src/tlsproxy.h
index 5c0940c932f66365af0e12cd657e8e9d22e03e6e..f93be4609f9573fe49b578c3227a99222eae46d9 100644 (file)
--- 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. */
 /* 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. */
 /* 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. */
 
 
 /* Proxy hostname and port if specified on the command line. */

diff --git a/src/verify.c b/src/verify.c
index 7031c28d85752e2f3c398d94fa057b9a35dacc9a..855c5d21c4bcf470fb9d036523a984e7c4a3a6aa 100644 (file)
--- 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) {
 }
 
 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) {
                                 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;
                              hostname, path, size) != 0) {
         LOG_PERROR(ERROR, "server_certificate_file(): failed to get path");
         return -1;