[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  f223e8fd1c89d0e47e2acafe14d7f3a4e8a05742 (commit)
      from  eaf39a9fe6f55feb5251e235069e02f7f50d9a49 (commit)


- Log -----------------------------------------------------------------
commit f223e8fd1c89d0e47e2acafe14d7f3a4e8a05742
Author: Ana María Martínez Gómez <ammartinez at suse.de>
Date:   Sat Jun 23 00:01:17 2018 +0200

    Support directories with "." in x509_load_serial()
    
    Use `strrchr` to get a pointer to the last occurrence of `.` in the
    path string, instead of the first one with `strchr`.  This prevent the
    path to be wrongly split if it contains several `.`, and not only the
    one for the extension.
    
    Fixes https://github.com/openssl/openssl/issues/6489.
    
    CLA: trivial
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6566)

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

Summary of changes:
 apps/x509.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/x509.c b/apps/x509.c
index 1136642..d40960c 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -916,7 +916,7 @@ static ASN1_INTEGER *x509_load_serial(const char *CAfile,
     BIGNUM *serial = NULL;
 
     if (serialfile == NULL) {
-        const char *p = strchr(CAfile, '.');
+        const char *p = strrchr(CAfile, '.');
         size_t len = p != NULL ? (size_t)(p - CAfile) : strlen(CAfile);
 
         buf = app_malloc(len + sizeof(POSTFIX), "serial# buffer");