Module Name: src
Committed By: christos
Date: Sat Jun 11 16:54:58 UTC 2011
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/bf: bftest.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bntest.c divtest.c
src/crypto/external/bsd/openssl/dist/crypto/cast: casttest.c
src/crypto/external/bsd/openssl/dist/crypto/conf: test.c
src/crypto/external/bsd/openssl/dist/crypto/des: destest.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ectest.c
src/crypto/external/bsd/openssl/dist/crypto/engine: enginetest.c
src/crypto/external/bsd/openssl/dist/crypto/hmac: hmactest.c
src/crypto/external/bsd/openssl/dist/crypto/md2: md2test.c
src/crypto/external/bsd/openssl/dist/crypto/md4: md4test.c
src/crypto/external/bsd/openssl/dist/crypto/md5: md5test.c
src/crypto/external/bsd/openssl/dist/crypto/ripemd: rmdtest.c
src/crypto/external/bsd/openssl/dist/crypto/sha: sha1test.c shatest.c
src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c
src/crypto/external/bsd/openssl/dist/crypto/x509v3: tabtest.c
Log Message:
format fixes, prototype fixes, const fixes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/bf/bftest.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/bn/divtest.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/cast/casttest.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/conf/test.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/des/destest.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/md4/md4test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/md5/md5test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c \
src/crypto/external/bsd/openssl/dist/crypto/sha/shatest.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/bf/bftest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/bf/bftest.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/bf/bftest.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/bf/bftest.c:1.1.1.1 Sun Jul 19 19:02:59 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/bf/bftest.c Sat Jun 11 12:54:56 2011
@@ -79,7 +79,7 @@
#include <openssl/ebcdic.h>
#endif
-static char *bf_key[2]={
+static const char *bf_key[2]={
"abcdefghijklmnopqrstuvwxyz",
"Who is John Galt?"
};
@@ -371,7 +371,7 @@
#ifdef CHARSET_EBCDIC
ebcdic2ascii(bf_key[n], bf_key[n], strlen(bf_key[n]));
#endif
- BF_set_key(&key,strlen(bf_key[n]),(unsigned char *)bf_key[n]);
+ BF_set_key(&key,strlen(bf_key[n]), (const unsigned char *)bf_key[n]);
data[0]=bf_plain[n][0];
data[1]=bf_plain[n][1];
Index: src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c:1.1.1.2 src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c:1.1.1.2 Sat Dec 26 18:31:43 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c Sat Jun 11 12:54:56 2011
@@ -127,7 +127,7 @@
static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-static void message(BIO *out, char *m)
+static void message(BIO *out, const char *m)
{
fprintf(stderr, "test %s\n", m);
BIO_puts(out, "print \"test ");
Index: src/crypto/external/bsd/openssl/dist/crypto/bn/divtest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/bn/divtest.c:1.3 src/crypto/external/bsd/openssl/dist/crypto/bn/divtest.c:1.4
--- src/crypto/external/bsd/openssl/dist/crypto/bn/divtest.c:1.3 Sun May 15 19:43:56 2011
+++ src/crypto/external/bsd/openssl/dist/crypto/bn/divtest.c Sat Jun 11 12:54:56 2011
@@ -8,7 +8,7 @@
return (x[0] + 2*x[1]);
}
-static void bug(char *m, BIGNUM *a, BIGNUM *b)
+static void bug(const char *m, BIGNUM *a, BIGNUM *b)
{
printf("%s!\na=",m);
BN_print_fp(stdout, a);
Index: src/crypto/external/bsd/openssl/dist/crypto/cast/casttest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/cast/casttest.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/cast/casttest.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/cast/casttest.c:1.1.1.1 Sun Jul 19 19:03:26 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/cast/casttest.c Sat Jun 11 12:54:57 2011
@@ -180,7 +180,7 @@
#ifdef FULL_TEST
{
unsigned char out_a[16],out_b[16];
- static char *hex="0123456789ABCDEF";
+ static const char *hex="0123456789ABCDEF";
printf("This test will take some time....");
fflush(stdout);
Index: src/crypto/external/bsd/openssl/dist/crypto/conf/test.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/conf/test.c:1.3 src/crypto/external/bsd/openssl/dist/crypto/conf/test.c:1.4
--- src/crypto/external/bsd/openssl/dist/crypto/conf/test.c:1.3 Sun May 15 20:08:33 2011
+++ src/crypto/external/bsd/openssl/dist/crypto/conf/test.c Sat Jun 11 12:54:57 2011
@@ -66,7 +66,7 @@
{
LHASH_OF(CONF_VALUE) *conf;
long eline;
- char *s,*s2;
+ char *s;
#ifdef USE_WIN32
CONF_set_default_method(CONF_WIN32);
Index: src/crypto/external/bsd/openssl/dist/crypto/des/destest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/des/destest.c:1.3 src/crypto/external/bsd/openssl/dist/crypto/des/destest.c:1.4
--- src/crypto/external/bsd/openssl/dist/crypto/des/destest.c:1.3 Mon Jul 20 16:41:05 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/des/destest.c Sat Jun 11 12:54:57 2011
@@ -386,7 +386,7 @@
DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT);
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
{
- int n;
+ unsigned int n;
printf("DES_ede3_cbcm_encrypt decrypt error\n");
for(n=0 ; n < i ; ++n)
@@ -535,7 +535,7 @@
if (memcmp(cbc_out,cbc3_ok,
(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
{
- int n;
+ unsigned int n;
printf("DES_ede3_cbc_encrypt encrypt error\n");
for(n=0 ; n < i ; ++n)
@@ -551,7 +551,7 @@
DES_ede3_cbc_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,DES_DECRYPT);
if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
{
- int n;
+ unsigned int n;
printf("DES_ede3_cbc_encrypt decrypt error\n");
for(n=0 ; n < i ; ++n)
@@ -828,7 +828,7 @@
static int bnum=0;
char *ret;
int i;
- static char *f="0123456789ABCDEF";
+ static const char *f="0123456789ABCDEF";
ret= &(bufs[bnum++][0]);
bnum%=10;
Index: src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c:1.1.1.2 src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c:1.1.1.2 Sun Jun 5 10:58:41 2011
+++ src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c Sat Jun 11 12:54:57 2011
@@ -234,7 +234,7 @@
BN_CTX_free(ctx);
}
-static void prime_field_tests()
+static void prime_field_tests(void)
{
BN_CTX *ctx = NULL;
BIGNUM *p, *a, *b;
@@ -777,7 +777,7 @@
if (!EC_GROUP_copy(_variable, group)) ABORT; \
-static void char2_field_tests()
+static void char2_field_tests(void)
{
BN_CTX *ctx = NULL;
BIGNUM *p, *a, *b;
Index: src/crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c:1.1.1.1 Sun Jul 19 19:04:00 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/engine/enginetest.c Sat Jun 11 12:54:57 2011
@@ -258,8 +258,8 @@
}
for(loop = 0; loop < 512; loop++)
{
- OPENSSL_free((void *)ENGINE_get_id(block[loop]));
- OPENSSL_free((void *)ENGINE_get_name(block[loop]));
+ OPENSSL_free((void *)(intptr_t)ENGINE_get_id(block[loop]));
+ OPENSSL_free((void *)(intptr_t)ENGINE_get_name(block[loop]));
}
printf("\nTests completed happily\n");
to_return = 0;
Index: src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c:1.2 Sun Jul 19 19:30:39 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c Sat Jun 11 12:54:57 2011
@@ -81,28 +81,28 @@
#ifndef OPENSSL_NO_MD5
static struct test_st
{
- unsigned char key[16];
+ const unsigned char key[16];
int key_len;
- unsigned char data[64];
+ const unsigned char data[64];
int data_len;
- unsigned char *digest;
+ const unsigned char *digest;
} test[4]={
{ "",
0,
"More text test vectors to stuff up EBCDIC machines :-)",
54,
- (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",
+ (const unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",
},{ {0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,
0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,},
16,
"Hi There",
8,
- (unsigned char *)"9294727a3638bb1c13f48ef8158bfc9d",
+ (const unsigned char *)"9294727a3638bb1c13f48ef8158bfc9d",
},{ "Jefe",
4,
"what do ya want for nothing?",
28,
- (unsigned char *)"750c783e6ab0b503eaa86e310a5db738",
+ (const unsigned char *)"750c783e6ab0b503eaa86e310a5db738",
},{
{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,},
@@ -115,7 +115,7 @@
0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
0xdd,0xdd},
50,
- (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",
+ (const unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",
},
};
#endif
@@ -147,7 +147,7 @@
test[i].data, test[i].data_len,
NULL,NULL));
- if (strcmp(p,(char *)test[i].digest) != 0)
+ if (strcmp(p,(const char *)test[i].digest) != 0)
{
printf("error calculating HMAC on %d entry'\n",i);
printf("got %s instead of %s\n",p,test[i].digest);
Index: src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c:1.3 src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c:1.4
--- src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c:1.3 Mon Jul 20 16:41:05 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/md2/md2test.c Sat Jun 11 12:54:57 2011
@@ -76,7 +76,7 @@
#include <openssl/ebcdic.h>
#endif
-static char *test[]={
+static const char *test[]={
"",
"a",
"abc",
@@ -87,7 +87,7 @@
NULL,
};
-static char *ret[]={
+static const char *ret[]={
"8350e5a3e24c153df2275c9f80692773",
"32ec01ec4a6dac72c0ab96fb34c0b5d1",
"da853b0d3f88d99b30283a69e6ded6bb",
@@ -101,7 +101,7 @@
int main(int argc, char *argv[])
{
int i,err=0;
- char **P,**R;
+ const char **P,**R;
char *p;
unsigned char md[MD2_DIGEST_LENGTH];
@@ -110,7 +110,7 @@
i=1;
while (*P != NULL)
{
- EVP_Digest((unsigned char *)*P,strlen(*P),md,NULL,EVP_md2(), NULL);
+ EVP_Digest((const unsigned char *)*P,strlen(*P),md,NULL,EVP_md2(), NULL);
p=pt(md);
if (strcmp(p,*R) != 0)
{
Index: src/crypto/external/bsd/openssl/dist/crypto/md4/md4test.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/md4/md4test.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/md4/md4test.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/md4/md4test.c:1.2 Sun Jul 19 19:30:40 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/md4/md4test.c Sat Jun 11 12:54:57 2011
@@ -72,7 +72,7 @@
#include <openssl/evp.h>
#include <openssl/md4.h>
-static char *test[]={
+static const char *test[]={
"",
"a",
"abc",
@@ -83,7 +83,7 @@
NULL,
};
-static char *ret[]={
+static const char *ret[]={
"31d6cfe0d16ae931b73c59d7e0c089c0",
"bde52cb31de33e46245e05fbdbd6fb24",
"a448017aaf21d8525fc10ae87aa6729d",
@@ -97,7 +97,7 @@
int main(int argc, char *argv[])
{
int i,err=0;
- char **P,**R;
+ const char **P,**R;
char *p;
unsigned char md[MD4_DIGEST_LENGTH];
@@ -106,9 +106,9 @@
i=1;
while (*P != NULL)
{
- EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md4(), NULL);
+ EVP_Digest(&(P[0][0]),strlen((const char *)*P),md,NULL,EVP_md4(), NULL);
p=pt(md);
- if (strcmp(p,(char *)*R) != 0)
+ if (strcmp(p,(const char *)*R) != 0)
{
printf("error calculating MD4 on '%s'\n",*P);
printf("got %s instead of %s\n",p,*R);
Index: src/crypto/external/bsd/openssl/dist/crypto/md5/md5test.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/md5/md5test.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/md5/md5test.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/md5/md5test.c:1.2 Sun Jul 19 19:30:40 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/md5/md5test.c Sat Jun 11 12:54:57 2011
@@ -72,7 +72,7 @@
#include <openssl/evp.h>
#include <openssl/md5.h>
-static char *test[]={
+static const char *test[]={
"",
"a",
"abc",
@@ -83,7 +83,7 @@
NULL,
};
-static char *ret[]={
+static const char *ret[]={
"d41d8cd98f00b204e9800998ecf8427e",
"0cc175b9c0f1b6a831c399e269772661",
"900150983cd24fb0d6963f7d28e17f72",
@@ -97,7 +97,7 @@
int main(int argc, char *argv[])
{
int i,err=0;
- char **P,**R;
+ const char **P,**R;
char *p;
unsigned char md[MD5_DIGEST_LENGTH];
@@ -106,9 +106,9 @@
i=1;
while (*P != NULL)
{
- EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md5(), NULL);
+ EVP_Digest(&(P[0][0]),strlen((const char *)*P),md,NULL,EVP_md5(), NULL);
p=pt(md);
- if (strcmp(p,(char *)*R) != 0)
+ if (strcmp(p,(const char *)*R) != 0)
{
printf("error calculating MD5 on '%s'\n",*P);
printf("got %s instead of %s\n",p,*R);
Index: src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c:1.2 Sun Jul 19 19:30:41 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmdtest.c Sat Jun 11 12:54:58 2011
@@ -76,7 +76,7 @@
#include <openssl/ebcdic.h>
#endif
-static char *test[]={
+static const char *test[]={
"",
"a",
"abc",
@@ -88,7 +88,7 @@
NULL,
};
-static char *ret[]={
+static const char *ret[]={
"9c1185a5c5e9fc54612808977ee8f548b2258d31",
"0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
"8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
@@ -103,7 +103,7 @@
int main(int argc, char *argv[])
{
int i,err=0;
- char **P,**R;
+ const char **P,**R;
char *p;
unsigned char md[RIPEMD160_DIGEST_LENGTH];
@@ -113,11 +113,11 @@
while (*P != NULL)
{
#ifdef CHARSET_EBCDIC
- ebcdic2ascii((char *)*P, (char *)*P, strlen((char *)*P));
+ ebcdic2ascii((const char *)*P, (const char *)*P, strlen((const char *)*P));
#endif
- EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL);
+ EVP_Digest(&(P[0][0]),strlen((const char *)*P),md,NULL,EVP_ripemd160(), NULL);
p=pt(md);
- if (strcmp(p,(char *)*R) != 0)
+ if (strcmp(p,(const char *)*R) != 0)
{
printf("error calculating RIPEMD160 on '%s'\n",*P);
printf("got %s instead of %s\n",p,*R);
Index: src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c:1.2 Sun Jul 19 19:30:41 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/sha/sha1test.c Sat Jun 11 12:54:58 2011
@@ -79,26 +79,26 @@
#undef SHA_0 /* FIPS 180 */
#define SHA_1 /* FIPS 180-1 */
-static char *test[]={
+static const char *test[]={
"abc",
"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
NULL,
};
#ifdef SHA_0
-static char *ret[]={
+static const char *ret[]={
"0164b8a914cd2a5e74c4f7ff082c4d97f1edf880",
"d2516ee1acfa5baf33dfc1c471e438449ef134c8",
};
-static char *bigret=
+static const char *bigret=
"3232affa48628a26653b5aaa44541fd90d690603";
#endif
#ifdef SHA_1
-static char *ret[]={
+static const char *ret[]={
"a9993e364706816aba3e25717850c26c9cd0d89d",
"84983e441c3bd26ebaae4aa1f95129e5e54670f1",
};
-static char *bigret=
+static const char *bigret=
"34aa973cd4c4daa4f61eeb2bdbad27316534016f";
#endif
@@ -106,9 +106,9 @@
int main(int argc, char *argv[])
{
int i,err=0;
- char **P,**R;
+ const char **P,**R;
static unsigned char buf[1000];
- char *p,*r;
+ const char *p,*r;
EVP_MD_CTX c;
unsigned char md[SHA_DIGEST_LENGTH];
@@ -123,9 +123,9 @@
i=1;
while (*P != NULL)
{
- EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha1(), NULL);
+ EVP_Digest(*P,strlen((const char *)*P),md,NULL,EVP_sha1(), NULL);
p=pt(md);
- if (strcmp(p,(char *)*R) != 0)
+ if (strcmp(p,(const char *)*R) != 0)
{
printf("error calculating SHA1 on '%s'\n",*P);
printf("got %s instead of %s\n",p,*R);
Index: src/crypto/external/bsd/openssl/dist/crypto/sha/shatest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/shatest.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/sha/shatest.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/sha/shatest.c:1.2 Sun Jul 19 19:30:42 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/sha/shatest.c Sat Jun 11 12:54:58 2011
@@ -79,26 +79,26 @@
#define SHA_0 /* FIPS 180 */
#undef SHA_1 /* FIPS 180-1 */
-static char *test[]={
+static const char *test[]={
"abc",
"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
NULL,
};
#ifdef SHA_0
-static char *ret[]={
+static const char *ret[]={
"0164b8a914cd2a5e74c4f7ff082c4d97f1edf880",
"d2516ee1acfa5baf33dfc1c471e438449ef134c8",
};
-static char *bigret=
+static const char *bigret=
"3232affa48628a26653b5aaa44541fd90d690603";
#endif
#ifdef SHA_1
-static char *ret[]={
+static const char *ret[]={
"a9993e364706816aba3e25717850c26c9cd0d89d",
"84983e441c3bd26ebaae4aa1f95129e5e54670f1",
};
-static char *bigret=
+static const char *bigret=
"34aa973cd4c4daa4f61eeb2bdbad27316534016f";
#endif
@@ -106,9 +106,9 @@
int main(int argc, char *argv[])
{
int i,err=0;
- char **P,**R;
+ const char **P,**R;
static unsigned char buf[1000];
- char *p,*r;
+ const char *p,*r;
EVP_MD_CTX c;
unsigned char md[SHA_DIGEST_LENGTH];
Index: src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c:1.3 src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c:1.4
--- src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c:1.3 Mon Jul 20 16:41:06 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c Sat Jun 11 12:54:58 2011
@@ -152,17 +152,17 @@
{
fprintf(fp,"%4ld items in the session cache\n",
SSL_CTX_sess_number(ctx));
- fprintf(fp,"%4d client connects (SSL_connect())\n",
+ fprintf(fp,"%4ld client connects (SSL_connect())\n",
SSL_CTX_sess_connect(ctx));
- fprintf(fp,"%4d client connects that finished\n",
+ fprintf(fp,"%4ld client connects that finished\n",
SSL_CTX_sess_connect_good(ctx));
- fprintf(fp,"%4d server connects (SSL_accept())\n",
+ fprintf(fp,"%4ld server connects (SSL_accept())\n",
SSL_CTX_sess_accept(ctx));
- fprintf(fp,"%4d server connects that finished\n",
+ fprintf(fp,"%4ld server connects that finished\n",
SSL_CTX_sess_accept_good(ctx));
- fprintf(fp,"%4d session cache hits\n",SSL_CTX_sess_hits(ctx));
- fprintf(fp,"%4d session cache misses\n",SSL_CTX_sess_misses(ctx));
- fprintf(fp,"%4d session cache timeouts\n",SSL_CTX_sess_timeouts(ctx));
+ fprintf(fp,"%4ld session cache hits\n",SSL_CTX_sess_hits(ctx));
+ fprintf(fp,"%4ld session cache misses\n",SSL_CTX_sess_misses(ctx));
+ fprintf(fp,"%4ld session cache timeouts\n",SSL_CTX_sess_timeouts(ctx));
}
static void sv_usage(void)
@@ -192,8 +192,8 @@
int server_auth=0;
SSL_CTX *s_ctx=NULL;
SSL_CTX *c_ctx=NULL;
- char *scert=TEST_SERVER_CERT;
- char *ccert=TEST_CLIENT_CERT;
+ const char *scert=TEST_SERVER_CERT;
+ const char *ccert=TEST_CLIENT_CERT;
const SSL_METHOD *ssl_method=SSLv23_method();
RAND_seed(rnd_seed, sizeof rnd_seed);
@@ -367,7 +367,7 @@
#define C_DONE 1
#define S_DONE 2
-int ndoit(SSL_CTX *ssl_ctx[2])
+static int ndoit(SSL_CTX *ssl_ctx[2])
{
int i;
int ret;
@@ -831,8 +831,8 @@
mutex_init(&(lock_cs[i]),USYNC_THREAD,NULL);
}
- CRYPTO_set_id_callback((unsigned long (*)())solaris_thread_id);
- CRYPTO_set_locking_callback((void (*)())solaris_locking_callback);
+ CRYPTO_set_id_callback((unsigned long (*)(void))solaris_thread_id);
+ CRYPTO_set_locking_callback((void (*)(void))solaris_locking_callback);
}
void thread_cleanup(void)
@@ -953,8 +953,8 @@
lock_cs[i]=usnewsema(arena,1);
}
- CRYPTO_set_id_callback((unsigned long (*)())irix_thread_id);
- CRYPTO_set_locking_callback((void (*)())irix_locking_callback);
+ CRYPTO_set_id_callback((unsigned long (*)(void))irix_thread_id);
+ CRYPTO_set_locking_callback((void (*)(void))irix_locking_callback);
}
void thread_cleanup(void)
@@ -1038,8 +1038,8 @@
pthread_mutex_init(&(lock_cs[i]),NULL);
}
- CRYPTO_set_id_callback((unsigned long (*)())pthreads_thread_id);
- CRYPTO_set_locking_callback((void (*)())pthreads_locking_callback);
+ CRYPTO_set_id_callback((unsigned long (*)(void))pthreads_thread_id);
+ CRYPTO_set_locking_callback((void (*)(int, int, const char *, int))pthreads_locking_callback);
}
void thread_cleanup(void)
@@ -1101,7 +1101,7 @@
for (i=0; i<thread_number; i++)
{
pthread_create(&(thread_ctx[i]), NULL,
- (void *(*)())ndoit, (void *)ssl_ctx);
+ (void *(*)(void *))ndoit, (void *)ssl_ctx);
}
printf("reaping\n");
@@ -1142,8 +1142,8 @@
ThreadSem = MPKSemaphoreAlloc("OpenSSL mttest semaphore", 0 );
- CRYPTO_set_id_callback((unsigned long (*)())netware_thread_id);
- CRYPTO_set_locking_callback((void (*)())netware_locking_callback);
+ CRYPTO_set_id_callback((unsigned long (*)(void))netware_thread_id);
+ CRYPTO_set_locking_callback((void (*)(void))netware_locking_callback);
}
void thread_cleanup(void)
@@ -1231,7 +1231,7 @@
lock_cs[i] = new BLocker(CRYPTO_get_lock_name(i));
}
- CRYPTO_set_id_callback((unsigned long (*)())beos_thread_id);
+ CRYPTO_set_id_callback((unsigned long (*)(void))beos_thread_id);
CRYPTO_set_locking_callback(beos_locking_callback);
}
Index: src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c:1.4 src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c:1.5
--- src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c:1.4 Sun May 15 20:08:33 2011
+++ src/crypto/external/bsd/openssl/dist/crypto/x509v3/tabtest.c Sat Jun 11 12:54:58 2011
@@ -69,7 +69,8 @@
int
main(void)
{
- int i, prev = -1, bad = 0;
+ int prev = -1, bad = 0;
+ unsigned int i;
const X509V3_EXT_METHOD **tmp;
i = sizeof(standard_exts) / sizeof(X509V3_EXT_METHOD *);
if(i != STANDARD_EXTENSION_COUNT)
