some more patches for avoiding problems with non-automatic variables

diff --git a/CHANGES b/CHANGES
index 5083878993a50891130ac08f5d0d8d477ebf3288..231726ea4f838eb6e4193fa5526756e48c27128b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.4 and 0.9.5  [xx XXX 1999]
 
 
  Changes between 0.9.4 and 0.9.5  [xx XXX 1999]
 

+  *) Initialize all non-automatic variables each time one of the openssl
+     sub-programs is started (this is necessary as they may be started
+     multiple times from the "OpenSSL>" prompt).
+     [Lennart Bang, Bodo Moeller]
+

   *) Preliminary compilation option RSA_NULL which disables RSA crypto without
      removing all other RSA functionality (this is what NO_RSA does). This
      is so (for example) those in the US can disable those operations covered
   *) Preliminary compilation option RSA_NULL which disables RSA crypto without
      removing all other RSA functionality (this is what NO_RSA does). This
      is so (for example) those in the US can disable those operations covered

diff --git a/apps/s_time.c b/apps/s_time.c
index a529e2a1190df6888acc17ad7d1575ec96732e41..a43df6bb92ac66b36c423d1be8345ef19ac33810 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -248,15 +248,6 @@ static int parseArgs(int argc, char **argv)
 
     verify_depth=0;
     verify_error=X509_V_OK;
 
     verify_depth=0;
     verify_error=X509_V_OK;

-#ifdef FIONBIO
-    t_nbio=0;
-#endif
-
-       apps_startup();
-       s_time_init();
-
-       if (bio_err == NULL)
-               bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);

 
     argc--;
     argv++;
 
     argc--;
     argv++;


@@ -411,6 +402,12 @@ int MAIN(int argc, char **argv)
        MS_STATIC char buf[1024*8];
        int ver;
 
        MS_STATIC char buf[1024*8];
        int ver;
 

+       apps_startup();
+       s_time_init();
+
+       if (bio_err == NULL)
+               bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+

 #if !defined(NO_SSL2) && !defined(NO_SSL3)
        s_time_meth=SSLv23_client_method();
 #elif !defined(NO_SSL3)
 #if !defined(NO_SSL2) && !defined(NO_SSL3)
        s_time_meth=SSLv23_client_method();
 #elif !defined(NO_SSL3)

diff --git a/apps/speed.c b/apps/speed.c
index cf5cbd23732249a82140917f6eea194216f33ae5..2819212aac138e5723f2d637754f6381bd0b52e1 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -344,6 +344,7 @@ int MAIN(int argc, char **argv)
        int pr_header=0;
 
        apps_startup();
        int pr_header=0;
 
        apps_startup();

+       memset(results, 0, sizeof(results));

 #ifndef NO_DSA
        memset(dsa_key,0,sizeof(dsa_key));
 #endif
 #ifndef NO_DSA
        memset(dsa_key,0,sizeof(dsa_key));
 #endif

diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index 9a67dff36a20b5f46b7eb64f40ca571a4d18bb4e..4b56b8ee135564499bb701dab5fce1af7704dfb8 100644 (file)
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 #include <openssl/ebcdic.h>
 #endif
 
 #include <openssl/ebcdic.h>
 #endif
 

-struct test_st
+static struct test_st

        {
        unsigned char key[16];
        int key_len;
        {
        unsigned char key[16];
        int key_len;

diff --git a/crypto/md2/md2test.c b/crypto/md2/md2test.c
index 461d124957f794406e1631dc5f0ca2d9d69707a7..e3f4fb4c341af264b2d2de675822d63860d266a6 100644 (file)
--- a/crypto/md2/md2test.c
+++ b/crypto/md2/md2test.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 #include <openssl/ebcdic.h>
 #endif
 
 #include <openssl/ebcdic.h>
 #endif
 

-char *test[]={
+static char *test[]={

        "",
        "a",
        "abc",
        "",
        "a",
        "abc",


@@ -84,7 +84,7 @@ char *test[]={
        NULL,
        };
 
        NULL,
        };
 

-char *ret[]={
+static char *ret[]={

        "8350e5a3e24c153df2275c9f80692773",
        "32ec01ec4a6dac72c0ab96fb34c0b5d1",
        "da853b0d3f88d99b30283a69e6ded6bb",
        "8350e5a3e24c153df2275c9f80692773",
        "32ec01ec4a6dac72c0ab96fb34c0b5d1",
        "da853b0d3f88d99b30283a69e6ded6bb",

diff --git a/crypto/md5/md5test.c b/crypto/md5/md5test.c
index a192a62bb30edbc86a2735deaefe315f66c236c4..6bd86563020e1b871b286355b8a6c40866b76d99 100644 (file)
--- a/crypto/md5/md5test.c
+++ b/crypto/md5/md5test.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 #else
 #include <openssl/md5.h>
 
 #else
 #include <openssl/md5.h>
 

-char *test[]={
+static char *test[]={

        "",
        "a",
        "abc",
        "",
        "a",
        "abc",


@@ -80,7 +80,7 @@ char *test[]={
        NULL,
        };
 
        NULL,
        };
 

-char *ret[]={
+static char *ret[]={

        "d41d8cd98f00b204e9800998ecf8427e",
        "0cc175b9c0f1b6a831c399e269772661",
        "900150983cd24fb0d6963f7d28e17f72",
        "d41d8cd98f00b204e9800998ecf8427e",
        "0cc175b9c0f1b6a831c399e269772661",
        "900150983cd24fb0d6963f7d28e17f72",

diff --git a/crypto/ripemd/rmdtest.c b/crypto/ripemd/rmdtest.c
index 5e93d4627c9b52fcdf7ed2fd478e48df56d1b69a..5d79c997253baf1c19672e8801b65190daf70d08 100644 (file)
--- a/crypto/ripemd/rmdtest.c
+++ b/crypto/ripemd/rmdtest.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 #include <openssl/ebcdic.h>
 #endif
 
 #include <openssl/ebcdic.h>
 #endif
 

-char *test[]={
+static char *test[]={

        "",
        "a",
        "abc",
        "",
        "a",
        "abc",


@@ -85,7 +85,7 @@ char *test[]={
        NULL,
        };
 
        NULL,
        };
 

-char *ret[]={
+static char *ret[]={

        "9c1185a5c5e9fc54612808977ee8f548b2258d31",
        "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
        "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
        "9c1185a5c5e9fc54612808977ee8f548b2258d31",
        "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
        "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",

diff --git a/crypto/sha/sha1test.c b/crypto/sha/sha1test.c
index 9400ad2a61fbcccd980156f94760eca1cb3fdbd1..688d06c63747a41025482394ee280213495cd0d6 100644 (file)
--- a/crypto/sha/sha1test.c
+++ b/crypto/sha/sha1test.c
@@ -76,26 +76,26 @@ int main(int argc, char *argv[])
 #undef SHA_0 /* FIPS 180 */
 #define  SHA_1 /* FIPS 180-1 */
 
 #undef SHA_0 /* FIPS 180 */
 #define  SHA_1 /* FIPS 180-1 */
 

-char *test[]={
+static char *test[]={

        "abc",
        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
        NULL,
        };
 
 #ifdef SHA_0
        "abc",
        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
        NULL,
        };
 
 #ifdef SHA_0

-char *ret[]={
+static char *ret[]={

        "0164b8a914cd2a5e74c4f7ff082c4d97f1edf880",
        "d2516ee1acfa5baf33dfc1c471e438449ef134c8",
        };
        "0164b8a914cd2a5e74c4f7ff082c4d97f1edf880",
        "d2516ee1acfa5baf33dfc1c471e438449ef134c8",
        };

-char *bigret=
+static char *bigret=

        "3232affa48628a26653b5aaa44541fd90d690603";
 #endif
 #ifdef SHA_1
        "3232affa48628a26653b5aaa44541fd90d690603";
 #endif
 #ifdef SHA_1

-char *ret[]={
+static char *ret[]={

        "a9993e364706816aba3e25717850c26c9cd0d89d",
        "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
        };
        "a9993e364706816aba3e25717850c26c9cd0d89d",
        "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
        };

-char *bigret=
+static char *bigret=

        "34aa973cd4c4daa4f61eeb2bdbad27316534016f";
 #endif
 
        "34aa973cd4c4daa4f61eeb2bdbad27316534016f";
 #endif
 

diff --git a/crypto/sha/shatest.c b/crypto/sha/shatest.c
index 2b0744d937cd1b5c6f088509174abf8f31de7500..a5786bbf768d3ce63871b25cb54d28dc61aa3353 100644 (file)
--- a/crypto/sha/shatest.c
+++ b/crypto/sha/shatest.c
@@ -76,26 +76,26 @@ int main(int argc, char *argv[])
 #define SHA_0 /* FIPS 180 */
 #undef  SHA_1 /* FIPS 180-1 */
 
 #define SHA_0 /* FIPS 180 */
 #undef  SHA_1 /* FIPS 180-1 */
 

-char *test[]={
+static char *test[]={

        "abc",
        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
        NULL,
        };
 
 #ifdef SHA_0
        "abc",
        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
        NULL,
        };
 
 #ifdef SHA_0

-char *ret[]={
+static char *ret[]={

        "0164b8a914cd2a5e74c4f7ff082c4d97f1edf880",
        "d2516ee1acfa5baf33dfc1c471e438449ef134c8",
        };
        "0164b8a914cd2a5e74c4f7ff082c4d97f1edf880",
        "d2516ee1acfa5baf33dfc1c471e438449ef134c8",
        };

-char *bigret=
+static char *bigret=

        "3232affa48628a26653b5aaa44541fd90d690603";
 #endif
 #ifdef SHA_1
        "3232affa48628a26653b5aaa44541fd90d690603";
 #endif
 #ifdef SHA_1

-char *ret[]={
+static char *ret[]={

        "a9993e364706816aba3e25717850c26c9cd0d89d",
        "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
        };
        "a9993e364706816aba3e25717850c26c9cd0d89d",
        "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
        };

-char *bigret=
+static char *bigret=

        "34aa973cd4c4daa4f61eeb2bdbad27316534016f";
 #endif
 
        "34aa973cd4c4daa4f61eeb2bdbad27316534016f";
 #endif
 

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index b62f5ad4f74edc123503d9a292f616d30afa6c5e..ec57c71026c359e534c44dc018106d47518a8dc1 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -85,15 +85,15 @@
 #  define TEST_CLIENT_CERT "../apps/client.pem"
 #endif
 
 #  define TEST_CLIENT_CERT "../apps/client.pem"
 #endif
 

-int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);

 #ifndef NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength);
 #endif
 #ifndef NO_DH
 static DH *get_dh512(void);
 #endif
 #ifndef NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength);
 #endif
 #ifndef NO_DH
 static DH *get_dh512(void);
 #endif

-BIO *bio_err=NULL;
-BIO *bio_stdout=NULL;
+static BIO *bio_err=NULL;
+static BIO *bio_stdout=NULL;

 
 static char *cipher=NULL;
 int verbose=0;
 
 static char *cipher=NULL;
 int verbose=0;


@@ -1104,7 +1104,7 @@ err:
        return(ret);
        }
 
        return(ret);
        }
 

-int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
+static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)

        {
        char *s,buf[256];
 
        {
        char *s,buf[256];