[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  a7e7bad1681e2607ba59855a3c9215df64b278c0 (commit)
      from  a717738b45fa7ae90cf3dac0870b8d1ea2a8e173 (commit)


- Log -----------------------------------------------------------------
commit a7e7bad1681e2607ba59855a3c9215df64b278c0
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 17 00:29:57 2016 +0000

    Simplify define as we don't support MS-DOS anymore.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 include/openssl/ssl.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index e19a791..d7a6586 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -646,13 +646,8 @@ __owur int SRP_Calc_A_param(SSL *s);
 
 # endif
 
-# if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
-#  define SSL_MAX_CERT_LIST_DEFAULT 1024*30
-                                          /* 30k max cert list :-) */
-# else
-#  define SSL_MAX_CERT_LIST_DEFAULT 1024*100
-                                           /* 100k max cert list :-) */
-# endif
+/* 100k max cert list */
+# define SSL_MAX_CERT_LIST_DEFAULT 1024*100
 
 # define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)