LibreSSL: another go at getting DANE compileable

[exim.git] / src / util / gen_pkcs3.c

diff --git a/src/util/gen_pkcs3.c b/src/util/gen_pkcs3.c
index 6a467e07a99e950b345c5476fdc6ffac49cf6845..c5a4453cbcd8b9ef50aced6831b4bb685eb3c7f2 100644 (file)
--- a/src/util/gen_pkcs3.c
+++ b/src/util/gen_pkcs3.c
@@ -1,6 +1,8 @@
 /* Copyright (C) 2012,2016 Phil Pennock.
 /* Copyright (C) 2012,2016 Phil Pennock.

+ * Copyright (c) The Exim Maintainers 2021

  * This is distributed as part of Exim and licensed under the GPL.
  * See the file "NOTICE" for more details.
  * This is distributed as part of Exim and licensed under the GPL.
  * See the file "NOTICE" for more details.

+ * SPDX-License-Identifier: GPL-2.0-or-later

  */
 
 /* Build with:
  */
 
 /* Build with:


@@ -54,7 +56,6 @@ void __attribute__((__noreturn__))
 die_openssl_err(const char *msg)
 {
   char err_string[250];
 die_openssl_err(const char *msg)
 {
   char err_string[250];

-  unsigned long e;

 
   ERR_error_string_n(ERR_get_error(), err_string, sizeof(err_string));
   die("%s: %s", msg, err_string);
 
   ERR_error_string_n(ERR_get_error(), err_string, sizeof(err_string));
   die("%s: %s", msg, err_string);


@@ -71,9 +72,9 @@ bn_from_text(const char *text)
   int rc;
 
   len = strlen(text);
   int rc;
 
   len = strlen(text);

-  spaceless = malloc(len);
+  spaceless = malloc(len + 1);

   if (!spaceless)
   if (!spaceless)

-    die("malloc(%zu) failed: %s", len, strerror(errno));
+    die("malloc(%zu) failed: %s", len + 1, strerror(errno));

 
   for (p = spaceless, q = text, end = text + len;
        q < end;
 
   for (p = spaceless, q = text, end = text + len;
        q < end;


@@ -81,13 +82,15 @@ bn_from_text(const char *text)
     if (!isspace(*q))
       *p++ = *q;
   }
     if (!isspace(*q))
       *p++ = *q;
   }

+  len = p - spaceless;
+  *p++ = '\0';

 
   b = NULL;
   rc = BN_hex2bn(&b, spaceless);
 
 
   b = NULL;
   rc = BN_hex2bn(&b, spaceless);
 

-  if (rc != p - spaceless)
+  if (rc != (int)len)

     die("BN_hex2bn did not convert entire input; took %d of %zu bytes",
     die("BN_hex2bn did not convert entire input; took %d of %zu bytes",

-        rc, p - spaceless);
+        rc, len);

 
   return b;
 }
 
   return b;
 }