diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | apps/s_time.c | 15 | ||||
| -rw-r--r-- | apps/speed.c | 1 | ||||
| -rw-r--r-- | crypto/hmac/hmactest.c | 2 | ||||
| -rw-r--r-- | crypto/md2/md2test.c | 4 | ||||
| -rw-r--r-- | crypto/md5/md5test.c | 4 | ||||
| -rw-r--r-- | crypto/ripemd/rmdtest.c | 4 | ||||
| -rw-r--r-- | crypto/sha/sha1test.c | 10 | ||||
| -rw-r--r-- | crypto/sha/shatest.c | 10 | ||||
| -rw-r--r-- | ssl/ssltest.c | 8 |
10 files changed, 33 insertions, 30 deletions
@@ -4,6 +4,11 @@ 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 diff --git a/apps/s_time.c b/apps/s_time.c index a529e2a119..a43df6bb92 100644 --- 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; -#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++; @@ -411,6 +402,12 @@ int MAIN(int argc, char **argv) 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) diff --git a/apps/speed.c b/apps/speed.c index cf5cbd2373..2819212aac 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -344,6 +344,7 @@ int MAIN(int argc, char **argv) int pr_header=0; apps_startup(); + memset(results, 0, sizeof(results)); #ifndef NO_DSA memset(dsa_key,0,sizeof(dsa_key)); #endif diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c index 9a67dff36a..4b56b8ee13 100644 --- 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 -struct test_st +static struct test_st { unsigned char key[16]; int key_len; diff --git a/crypto/md2/md2test.c b/crypto/md2/md2test.c index 461d124957..e3f4fb4c34 100644 --- 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 -char *test[]={ +static char *test[]={ "", "a", "abc", @@ -84,7 +84,7 @@ char *test[]={ NULL, }; -char *ret[]={ +static char *ret[]={ "8350e5a3e24c153df2275c9f80692773", "32ec01ec4a6dac72c0ab96fb34c0b5d1", "da853b0d3f88d99b30283a69e6ded6bb", diff --git a/crypto/md5/md5test.c b/crypto/md5/md5test.c index a192a62bb3..6bd8656302 100644 --- 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> -char *test[]={ +static char *test[]={ "", "a", "abc", @@ -80,7 +80,7 @@ char *test[]={ NULL, }; -char *ret[]={ +static char *ret[]={ "d41d8cd98f00b204e9800998ecf8427e", "0cc175b9c0f1b6a831c399e269772661", "900150983cd24fb0d6963f7d28e17f72", diff --git a/crypto/ripemd/rmdtest.c b/crypto/ripemd/rmdtest.c index 5e93d4627c..5d79c99725 100644 --- 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 -char *test[]={ +static char *test[]={ "", "a", "abc", @@ -85,7 +85,7 @@ char *test[]={ NULL, }; -char *ret[]={ +static char *ret[]={ "9c1185a5c5e9fc54612808977ee8f548b2258d31", "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", diff --git a/crypto/sha/sha1test.c b/crypto/sha/sha1test.c index 9400ad2a61..688d06c637 100644 --- 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 */ -char *test[]={ +static char *test[]={ "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", NULL, }; #ifdef SHA_0 -char *ret[]={ +static char *ret[]={ "0164b8a914cd2a5e74c4f7ff082c4d97f1edf880", "d2516ee1acfa5baf33dfc1c471e438449ef134c8", }; -char *bigret= +static char *bigret= "3232affa48628a26653b5aaa44541fd90d690603"; #endif #ifdef SHA_1 -char *ret[]={ +static char *ret[]={ "a9993e364706816aba3e25717850c26c9cd0d89d", "84983e441c3bd26ebaae4aa1f95129e5e54670f1", }; -char *bigret= +static char *bigret= "34aa973cd4c4daa4f61eeb2bdbad27316534016f"; #endif diff --git a/crypto/sha/shatest.c b/crypto/sha/shatest.c index 2b0744d937..a5786bbf76 100644 --- 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 */ -char *test[]={ +static char *test[]={ "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", NULL, }; #ifdef SHA_0 -char *ret[]={ +static char *ret[]={ "0164b8a914cd2a5e74c4f7ff082c4d97f1edf880", "d2516ee1acfa5baf33dfc1c471e438449ef134c8", }; -char *bigret= +static char *bigret= "3232affa48628a26653b5aaa44541fd90d690603"; #endif #ifdef SHA_1 -char *ret[]={ +static char *ret[]={ "a9993e364706816aba3e25717850c26c9cd0d89d", "84983e441c3bd26ebaae4aa1f95129e5e54670f1", }; -char *bigret= +static char *bigret= "34aa973cd4c4daa4f61eeb2bdbad27316534016f"; #endif diff --git a/ssl/ssltest.c b/ssl/ssltest.c index b62f5ad4f7..ec57c71026 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -85,15 +85,15 @@ # 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 -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; @@ -1104,7 +1104,7 @@ err: 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]; |