X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=ssl_common.c;h=879111e9bc2fc47bbe4ddb858f422a480f3b01dd;hp=6d2e11f6342f17703f90d361491d509edc40e4c4;hb=873efe14859c0fb3f53a905eb346c36cf5fe7eda;hpb=e6c7a0409aed822fc6a8ad8028b7e7bde0b711ac

diff --git a/ssl_common.c b/ssl_common.c
index 6d2e11f6..879111e9 100644
--- a/ssl_common.c
+++ b/ssl_common.c
@@ -7,7 +7,7 @@
  *                not depend on particular TLS/SSL library.
  *
  * Copyright   :  Written by and Copyright (c) 2017 Vaclav Svec. FIT CVUT.
- *                Copyright (C) 2018-2020 by Fabian Keil <fk@fabiankeil.de>
+ *                Copyright (C) 2018-2021 by Fabian Keil <fk@fabiankeil.de>
  *
  *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
@@ -717,7 +717,10 @@ extern int host_is_ip_address(const char *host)
  *********************************************************************/
 extern int enforce_sane_certificate_state(const char *certificate, const char *key)
 {
-   if (file_exists(certificate) == 0 && file_exists(key) == 1)
+   const int certificate_exists = file_exists(certificate);
+   const int key_exists = file_exists(key);
+
+   if (!certificate_exists && key_exists)
    {
       log_error(LOG_LEVEL_ERROR,
          "A website key already exists but there's no matching certificate. "
@@ -729,6 +732,18 @@ extern int enforce_sane_certificate_state(const char *certificate, const char *k
          return -1;
       }
    }
+   if (certificate_exists && !key_exists)
+   {
+      log_error(LOG_LEVEL_ERROR,
+         "A certificate exists but there's no matching key. "
+         "Removing %s before creating a new key and certificate.", certificate);
+      if (unlink(certificate))
+      {
+         log_error(LOG_LEVEL_ERROR, "Failed to unlink %s: %E", certificate);
+
+         return -1;
+      }
+   }
 
    return 0;