[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  211a68b41a0dd3fed01ac9c93e495fdc03bd1e92 (commit)
       via  579415de5426b5b5e07b32c4ccffb7ed36facf9c (commit)
      from  e65780782aa41df5023410f64d5bb7a7cb3b2888 (commit)


- Log -----------------------------------------------------------------
commit 211a68b41a0dd3fed01ac9c93e495fdc03bd1e92
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 30 16:57:05 2015 +0100

    Fix faulty check in the VMS version of opt_progname
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 579415de5426b5b5e07b32c4ccffb7ed36facf9c
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 30 16:56:05 2015 +0100

    Remove the #ifndef OPENSSL_SYS_VMS around SSL_add_dir_cert_subjects_to_stack
    
    It served a purpose, but not any more.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 apps/opt.c            | 2 +-
 include/openssl/ssl.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/opt.c b/apps/opt.c
index 90a9d84..853c981 100644
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -127,7 +127,7 @@ char *opt_progname(const char *argv0)
     q = strrchr(p, '.');
     strncpy(prog, p, sizeof prog - 1);
     prog[sizeof prog - 1] = '\0';
-    if (q == NULL || q - p >= sizeof prog)
+    if (q != NULL && q - p < sizeof prog)
         prog[q - p] = '\0';
     return prog;
 }
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 0b9e5d7..8d82a6e 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1429,10 +1429,8 @@ __owur int SSL_use_certificate_chain_file(SSL *ssl, const char *file);
 __owur STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
 __owur int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
                                         const char *file);
-# ifndef OPENSSL_SYS_VMS
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
                                        const char *dir);
-# endif
 
 void SSL_load_error_strings(void);
 __owur const char *SSL_state_string(const SSL *s);