Included is a small patch to a bunch of C files in test/
I have just added the 'static' keyword to some variables
(ret, test, bigret etc.) in order to be able to link all the
test C programs into one library (I redefined main at
compile time).
I'd be very much obliged if the patch could be added
since it is quite harmless but saves people time who
wants to do something similar.
Thanks,
Lennart Bang
[EMAIL PROTECTED]
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/hmactest.c Fri Jun 4
20:35:48 1999
+++ hmactest.c Wed Sep 8 13:42:21 1999
@@ -73,7 +73,7 @@
#include <openssl/ebcdic.h>
#endif
-struct test_st
+static struct test_st
{
unsigned char key[16];
int key_len;
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/md2test.c Fri Jun 4 20:35:49 1999
+++ md2test.c Wed Sep 8 13:37:13 1999
@@ -73,7 +73,7 @@
#include <openssl/ebcdic.h>
#endif
-char *test[]={
+static char *test[]={
"",
"a",
"abc",
@@ -84,7 +84,7 @@
NULL,
};
-char *ret[]={
+static char *ret[]={
"8350e5a3e24c153df2275c9f80692773",
"32ec01ec4a6dac72c0ab96fb34c0b5d1",
"da853b0d3f88d99b30283a69e6ded6bb",
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/md5test.c Tue Apr 27 00:14:17 1999
+++ md5test.c Wed Sep 8 13:41:17 1999
@@ -69,7 +69,7 @@
#else
#include <openssl/md5.h>
-char *test[]={
+static char *test[]={
"",
"a",
"abc",
@@ -80,7 +80,7 @@
NULL,
};
-char *ret[]={
+static char *ret[]={
"d41d8cd98f00b204e9800998ecf8427e",
"0cc175b9c0f1b6a831c399e269772661",
"900150983cd24fb0d6963f7d28e17f72",
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/rmdtest.c Fri Jun 4 20:35:55 1999
+++ rmdtest.c Wed Sep 8 13:43:31 1999
@@ -73,7 +73,7 @@
#include <openssl/ebcdic.h>
#endif
-char *test[]={
+static char *test[]={
"",
"a",
"abc",
@@ -85,7 +85,7 @@
NULL,
};
-char *ret[]={
+static char *ret[]={
"9c1185a5c5e9fc54612808977ee8f548b2258d31",
"0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
"8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/sha1test.c Fri Jun 4
20:35:56 1999
+++ sha1test.c Wed Sep 8 13:43:07 1999
@@ -76,26 +76,26 @@
#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
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/shatest.c Fri Jun 4 20:35:56 1999
+++ shatest.c Wed Sep 8 13:43:17 1999
@@ -76,26 +76,26 @@
#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
===========================================================================
--- /usr/local/src/openssl-0.9.4/test/ssltest.c Thu Aug 5 10:50:17 1999
+++ ssltest.c Wed Sep 8 13:44:36 1999
@@ -85,14 +85,14 @@
# 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;
+static BIO *bio_err=NULL;
BIO *bio_stdout=NULL;
static char *cipher=NULL;
@@ -1091,7 +1091,7 @@
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];
===========================================================================
begin:vcard
n:Bang;Lennart
tel;cell:+46 70 733 14 70
tel;fax:+46 8 732 63 10
tel;work:+46 8 446 34 67
x-mozilla-html:TRUE
url:www.netstream.se
org:NetStream AB;Networking department
version:2.1
email;internet:[EMAIL PROTECTED]
title:http://www.netstream.se
adr;quoted-printable:;;Enhagsbacken 9=0D=0A;S-187 40 Taby;;;Sweden
fn:Lennart Bang
end:vcard
