merge 0.9.7b with local changes; crank majors for libssl/libcrypto

1 files changed, 39 insertions, 13 deletions

diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 342c59e659..5fccc48b71 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -109,11 +109,8 @@
  *
  */
 
-#define _XOPEN_SOURCE 600       /* Or gethostname won't be declared properly
+#define _BSD_SOURCE 1           /* Or gethostname won't be declared properly
                                    on Linux and GNU platforms. */
-#define _XOPEN_SOURCE_EXTENDED  1 /* Or gethostname won't be declared properly
-                                   on Compaq platforms (at least with DEC C).
-                                */
 
 #include <assert.h>
 #include <errno.h>
@@ -124,6 +121,7 @@
 #include <time.h>
 #include <inttypes.h>
 
+#define USE_SOCKETS
 #include "e_os.h"
 
 #include <openssl/bio.h>
@@ -131,12 +129,20 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 #include <openssl/err.h>
 #include <openssl/rand.h>
+
+#define _XOPEN_SOURCE_EXTENDED  1 /* Or gethostname won't be declared properly
+                                     on Compaq platforms (at least with DEC C).
+                                     Do not try to put it earlier, or IPv6 includes
+                                     get screwed...
+                                  */
+
 #ifdef OPENSSL_SYS_WINDOWS
 #include <winsock.h>
-#include "../crypto/bio/bss_file.c"
 #else
 #include OPENSSL_UNISTD
 #endif
@@ -144,6 +150,9 @@
 #ifdef OPENSSL_SYS_VMS
 #  define TEST_SERVER_CERT "SYS$DISK:[-.APPS]SERVER.PEM"
 #  define TEST_CLIENT_CERT "SYS$DISK:[-.APPS]CLIENT.PEM"
+#elif defined(OPENSSL_SYS_WINCE)
+#  define TEST_SERVER_CERT "\\OpenSSL\\server.pem"
+#  define TEST_CLIENT_CERT "\\OpenSSL\\client.pem"
 #else
 #  define TEST_SERVER_CERT "../apps/server.pem"
 #  define TEST_CLIENT_CERT "../apps/client.pem"
@@ -365,7 +374,9 @@ int main(int argc, char *argv[])
         verbose = 0;
         debug = 0;
         cipher = 0;
-        
+
+        bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); 
+
         CRYPTO_set_locking_callback(lock_dbg_cb);
 
         /* enable memory leak checking unless explicitly disabled */
@@ -383,7 +394,6 @@ int main(int argc, char *argv[])
 
         RAND_seed(rnd_seed, sizeof rnd_seed);
 
-        bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
         bio_stdout=BIO_new_fp(stdout,BIO_NOCLOSE);
 
         argc--;
@@ -406,7 +416,7 @@ int main(int argc, char *argv[])
 #ifndef OPENSSL_NO_DH
                         dhe1024=1;
 #else
-                        fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
+                        fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n");
 #endif
                         }
                 else if (strcmp(*argv,"-dhe1024dsa") == 0)
@@ -414,7 +424,7 @@ int main(int argc, char *argv[])
 #ifndef OPENSSL_NO_DH
                         dhe1024dsa=1;
 #else
-                        fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
+                        fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n");
 #endif
                         }
                 else if (strcmp(*argv,"-no_dhe") == 0)
@@ -531,7 +541,7 @@ bad:
                         "the test anyway (and\n-d to see what happens), "
                         "or add one of -ssl2, -ssl3, -tls1, -reuse\n"
                         "to avoid protocol mismatch.\n");
-                exit(1);
+                EXIT(1);
                 }
 
         if (print_time)
@@ -687,10 +697,16 @@ bad:
 #ifndef OPENSSL_NO_KRB5
         if (c_ssl  &&  c_ssl->kssl_ctx)
                 {
-                char    localhost[257];
+                char    localhost[MAXHOSTNAMELEN+2];
 
-                if (gethostname(localhost, 256) == 0)
+                if (gethostname(localhost, sizeof localhost-1) == 0)
                         {
+                        localhost[sizeof localhost-1]='\0';
+                        if(strlen(localhost) == sizeof localhost-1)
+                                {
+                                BIO_printf(bio_err,"localhost name too long\n");
+                                goto end;
+                                }
                         kssl_ctx_setstring(c_ssl->kssl_ctx, KSSL_SERVER,
                                 localhost);
                         }
@@ -746,7 +762,9 @@ end:
 #ifndef OPENSSL_NO_RSA
         free_tmp_rsa();
 #endif
+#ifndef OPENSSL_NO_ENGINE
         ENGINE_cleanup();
+#endif
         CRYPTO_cleanup_all_ex_data();
         ERR_free_strings();
         ERR_remove_state(0);
@@ -836,6 +854,8 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         int i, r;
                         clock_t c_clock = clock();
 
+                        memset(cbuf, 0, sizeof(cbuf));
+
                         if (debug)
                                 if (SSL_in_init(c_ssl))
                                         printf("client waiting in SSL_connect - %s\n",
@@ -920,6 +940,8 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         int i, r;
                         clock_t s_clock = clock();
 
+                        memset(sbuf, 0, sizeof(sbuf));
+
                         if (debug)
                                 if (SSL_in_init(s_ssl))
                                         printf("server waiting in SSL_accept - %s\n",
@@ -1163,6 +1185,9 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
         int c_write,s_write;
         int do_server=0,do_client=0;
 
+        memset(cbuf,0,sizeof(cbuf));
+        memset(sbuf,0,sizeof(sbuf));
+
         c_to_s=BIO_new(BIO_s_mem());
         s_to_c=BIO_new(BIO_s_mem());
         if ((s_to_c == NULL) || (c_to_s == NULL))
@@ -1444,7 +1469,8 @@ static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
         {
         char *s,buf[256];
 
-        s=X509_NAME_oneline(X509_get_subject_name(ctx->current_cert),buf,256);
+        s=X509_NAME_oneline(X509_get_subject_name(ctx->current_cert),buf,
+                            sizeof buf);
         if (s != NULL)
                 {
                 if (ok)