[openssl] master update

dev at ddvo.net dev at ddvo.net
Mon Mar 22 06:54:22 UTC 2021


The branch master has been updated
       via  db89d8f04bb131bbf0e2b87eb9a1515076c893d3 (commit)
      from  251c48183b4d8934716ac1e5e66e2a10b81373fe (commit)


- Log -----------------------------------------------------------------
commit db89d8f04bb131bbf0e2b87eb9a1515076c893d3
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Sun Mar 21 23:23:23 2021 +0100

    APPS: fix load_certs_multifile() interpreting backslashes
    
    Fixes #14622
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/14636)

-----------------------------------------------------------------------

Summary of changes:
 apps/lib/apps.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 61b3ebc6de..69a98ecf37 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -641,12 +641,8 @@ void* app_malloc(int sz, const char *what)
 char *next_item(char *opt) /* in list separated by comma and/or space */
 {
     /* advance to separator (comma or whitespace), if any */
-    while (*opt != ',' && !isspace(*opt) && *opt != '\0') {
-        if (*opt == '\\' && opt[1] != '\0')
-            /* skip and unescape '\' escaped char */
-            memmove(opt, opt + 1, strlen(opt));
+    while (*opt != ',' && !isspace(*opt) && *opt != '\0')
         opt++;
-    }
     if (*opt != '\0') {
         /* terminate current item */
         *opt++ = '\0';


More information about the openssl-commits mailing list