[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  691064c47fd6a7d11189df00a0d1b94d8051cbe0 (commit)
       via  b9bd7b06cc409e96ceb7606a79a7f5900aa696fe (commit)
       via  92d23b339c631bca2cf12a47e05f13772f9868a0 (commit)
       via  963bb62195109fb863dc4d88c7470ce7f9af25ac (commit)
      from  8731a4fcd267d56cab2ad6d7cfac2c846c413a5d (commit)


- Log -----------------------------------------------------------------
commit 691064c47fd6a7d11189df00a0d1b94d8051cbe0
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Mon Feb 22 16:44:46 2016 +0000

    Elide OPENSSL_INIT_set_config_filename() for no-stdio build
    
    Strictly speaking, it isn't stdio and file access which offend me here;
    it's the fact that UEFI doesn't provide a strdup() function. But the
    fact that it's pointless without file access is a good enough excuse for
    compiling it out.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b9bd7b06cc409e96ceb7606a79a7f5900aa696fe
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sun Feb 21 16:19:44 2016 +0000

    Elide DES_read_password() for no-ui build
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 92d23b339c631bca2cf12a47e05f13772f9868a0
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Feb 20 15:23:28 2016 +0000

    Move declaration of X509_aux_print() out of #ifndef OPENSSL_NO_STDIO
    
    This isn't a file access function; it's still present.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 963bb62195109fb863dc4d88c7470ce7f9af25ac
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Feb 20 15:07:32 2016 +0000

    Allow OPENSSL_NO_SOCK in e_os.h even for non-Windows/DOS platforms
    
    UEFI needs this too. Don't keep it only in the Windows/DOS ifdef block.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/conf/conf_lib.c   | 2 ++
 crypto/des/read2pwd.c    | 3 +++
 e_os.h                   | 5 +----
 include/openssl/crypto.h | 2 ++
 include/openssl/des.h    | 2 ++
 include/openssl/x509.h   | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index a84b643..f197714 100644
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -387,12 +387,14 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
 }
 
 
+#ifndef OPENSSL_NO_STDIO
 void OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
                                       const char *config_file)
 {
     free(settings->config_name);
     settings->config_name = config_file == NULL ? NULL : strdup(config_file);
 }
+#endif
 
 void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings)
 {
diff --git a/crypto/des/read2pwd.c b/crypto/des/read2pwd.c
index db31adb..748d0e6 100644
--- a/crypto/des/read2pwd.c
+++ b/crypto/des/read2pwd.c
@@ -113,6 +113,8 @@
 #include <openssl/ui.h>
 #include <openssl/crypto.h>
 
+#ifndef OPENSSL_NO_UI
+
 #ifndef BUFSIZ
 #define BUFSIZ 256
 #endif
@@ -141,3 +143,4 @@ int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2,
     OPENSSL_cleanse(buff, BUFSIZ);
     return (ok);
 }
+#endif
diff --git a/e_os.h b/e_os.h
index 41ab7bb..870c7a7 100644
--- a/e_os.h
+++ b/e_os.h
@@ -460,10 +460,7 @@ extern int kbhit(void);
 # endif
 
 # ifdef USE_SOCKETS
-#  if defined(WINDOWS) || defined(MSDOS)
-      /* windows world */
-
-#   ifdef OPENSSL_NO_SOCK
+#  ifdef OPENSSL_NO_SOCK
 #    define OpenSSL_Write(a,b,c)       (-1)
 #    define OpenSSL_Read(a,b,c)        (-1)
 #   elif !defined(__DJGPP__)
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index a881fad..bcc5aee 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -565,8 +565,10 @@ void OPENSSL_thread_stop(void);
 
 /* Low-level control of initialization */
 OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void);
+#ifndef OPENSSL_NO_STDIO
 void OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
                                       const char *config_file);
+#endif
 void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings);
 
 /* BEGIN ERROR CODES */
diff --git a/include/openssl/des.h b/include/openssl/des.h
index 649bc79..13ce232 100644
--- a/include/openssl/des.h
+++ b/include/openssl/des.h
@@ -220,9 +220,11 @@ void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, DES_key_schedule *schedule,
                        DES_cblock *ivec, int *num);
 
+#ifndef OPENSSL_NO_UI
 int DES_read_password(DES_cblock *key, const char *prompt, int verify);
 int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2,
                         const char *prompt, int verify);
+#endif
 
 # define DES_fixup_key_parity DES_set_odd_parity
 
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index c5f4ecc..fc77886 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -795,11 +795,11 @@ unsigned long X509_NAME_hash_old(X509_NAME *x);
 
 int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
 int X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
+int X509_aux_print(BIO *out, X509 *x, int indent);
 # ifndef OPENSSL_NO_STDIO
 int X509_print_ex_fp(FILE *bp, X509 *x, unsigned long nmflag,
                      unsigned long cflag);
 int X509_print_fp(FILE *bp, X509 *x);
-int X509_aux_print(BIO *out, X509 *x, int indent);
 int X509_CRL_print_fp(FILE *bp, X509_CRL *x);
 int X509_REQ_print_fp(FILE *bp, X509_REQ *req);
 int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent,