[prev in list] [next in list] [prev in thread] [next in thread]
List: openssl-cvs
Subject: [CVS] OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ Configure openssl/c...
From: "Dr. Stephen Henson" <steve () openssl ! org>
Date: 2007-12-16 17:10:12
Message-ID: 20071216171012.CBADD1EAE841 () master ! openssl ! org
[Download RAW message or body]
OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________
Server: cvs.openssl.org Name: Dr. Stephen Henson
Root: /v/openssl/cvs Email: steve@openssl.org
Module: openssl Date: 16-Dec-2007 18:10:11
Branch: OpenSSL-fips-0_9_8-stable Handle: 2007121617100605
Modified files: (Branch: OpenSSL-fips-0_9_8-stable)
openssl Configure
openssl/crypto/asn1 asn1.h tasn_dec.c tasn_enc.c tasn_fre.c
openssl/crypto/pem pem_info.c
openssl/crypto/sha .cvsignore shatest.c
Log:
Updates from 0.9.8-stable.
Summary:
Revision Changes Path
1.488.2.35.2.32+1 -1 openssl/Configure
1.128.2.4.2.2+1 -0 openssl/crypto/asn1/asn1.h
1.26.2.6.2.2+1 -1 openssl/crypto/asn1/tasn_dec.c
1.13.2.2.2.2+1 -1 openssl/crypto/asn1/tasn_enc.c
1.6.4.1 +1 -1 openssl/crypto/asn1/tasn_fre.c
1.26.2.1.2.1+1 -1 openssl/crypto/pem/pem_info.c
1.4.4.1 +1 -0 openssl/crypto/sha/.cvsignore
1.16.4.1 +3 -3 openssl/crypto/sha/shatest.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openssl/Configure
============================================================================
$ cvs diff -u -r1.488.2.35.2.31 -r1.488.2.35.2.32 Configure
--- openssl/Configure 14 Dec 2007 18:10:54 -0000 1.488.2.35.2.31
+++ openssl/Configure 16 Dec 2007 17:10:06 -0000 1.488.2.35.2.32
@@ -160,7 +160,7 @@
"debug-bodo", "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG \
-DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG \
${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", "debug-ulf", "gcc:-DTERMIOS \
-DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG \
-DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow \
-Wmissing-prototypes \
-Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll", \
"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK \
-DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -m32 -pedantic -Wno-long-long -Wall -Werror \
-Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} \
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
-"debug-steve-linux-pseudo64", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG \
-DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 \
-Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic \
-ldl:SIXTY_FOUR_BIT:${no_asm}:dlfcn:linux-shared", \
+"debug-steve-opt", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK \
-DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O3 -m32 -pedantic -Wno-long-long -Wall -Werror \
-Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} \
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared", \
"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG \
-DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO \
-D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow \
-Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef \
-Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} \
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG \
-DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM \
-DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi \
-Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long \
-Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} \
${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG \
-DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO \
-D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef \
-Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef \
-Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} \
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/asn1/asn1.h
============================================================================
$ cvs diff -u -r1.128.2.4.2.1 -r1.128.2.4.2.2 asn1.h
--- openssl/crypto/asn1/asn1.h 14 Dec 2007 01:15:35 -0000 1.128.2.4.2.1
+++ openssl/crypto/asn1/asn1.h 16 Dec 2007 17:10:07 -0000 1.128.2.4.2.2
@@ -522,6 +522,7 @@
* contain the set or sequence bytes */
ASN1_STRING * set;
ASN1_STRING * sequence;
+ ASN1_VALUE * asn1_value;
} value;
} ASN1_TYPE;
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/asn1/tasn_dec.c
============================================================================
$ cvs diff -u -r1.26.2.6.2.1 -r1.26.2.6.2.2 tasn_dec.c
--- openssl/crypto/asn1/tasn_dec.c 14 Dec 2007 01:15:35 -0000 1.26.2.6.2.1
+++ openssl/crypto/asn1/tasn_dec.c 16 Dec 2007 17:10:07 -0000 1.26.2.6.2.2
@@ -944,7 +944,7 @@
if (utype != typ->type)
ASN1_TYPE_set(typ, utype, NULL);
opval = pval;
- pval = (ASN1_VALUE **)&typ->value.ptr;
+ pval = &typ->value.asn1_value;
}
switch(utype)
{
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/asn1/tasn_enc.c
============================================================================
$ cvs diff -u -r1.13.2.2.2.1 -r1.13.2.2.2.2 tasn_enc.c
--- openssl/crypto/asn1/tasn_enc.c 14 Dec 2007 01:15:36 -0000 1.13.2.2.2.1
+++ openssl/crypto/asn1/tasn_enc.c 16 Dec 2007 17:10:08 -0000 1.13.2.2.2.2
@@ -597,7 +597,7 @@
typ = (ASN1_TYPE *)*pval;
utype = typ->type;
*putype = utype;
- pval = (ASN1_VALUE **)&typ->value.ptr;
+ pval = &typ->value.asn1_value;
}
else utype = *putype;
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/asn1/tasn_fre.c
============================================================================
$ cvs diff -u -r1.6 -r1.6.4.1 tasn_fre.c
--- openssl/crypto/asn1/tasn_fre.c 25 Apr 2004 12:46:39 -0000 1.6
+++ openssl/crypto/asn1/tasn_fre.c 16 Dec 2007 17:10:08 -0000 1.6.4.1
@@ -221,7 +221,7 @@
{
ASN1_TYPE *typ = (ASN1_TYPE *)*pval;
utype = typ->type;
- pval = (ASN1_VALUE **)&typ->value.ptr;
+ pval = &typ->value.asn1_value;
if (!*pval)
return;
}
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/pem/pem_info.c
============================================================================
$ cvs diff -u -r1.26.2.1 -r1.26.2.1.2.1 pem_info.c
--- openssl/crypto/pem/pem_info.c 16 Jul 2005 11:13:07 -0000 1.26.2.1
+++ openssl/crypto/pem/pem_info.c 16 Dec 2007 17:10:10 -0000 1.26.2.1.2.1
@@ -205,7 +205,7 @@
if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
goto err;
xi->x_pkey->dec_pkey->type=EVP_PKEY_DSA;
- pp=(char **)&(xi->x_pkey->dec_pkey->pkey.dsa);
+ pp=&xi->x_pkey->dec_pkey->pkey.dsa;
if ((int)strlen(header) > 10) /* assume encrypted */
raw=1;
}
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/sha/.cvsignore
============================================================================
$ cvs diff -u -r1.4 -r1.4.4.1 .cvsignore
--- openssl/crypto/sha/.cvsignore 26 Apr 2005 16:02:39 -0000 1.4
+++ openssl/crypto/sha/.cvsignore 16 Dec 2007 17:10:11 -0000 1.4.4.1
@@ -3,3 +3,4 @@
*.flc
semantic.cache
sx86-elf.s
+s512sse2-elf.s
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/sha/shatest.c
============================================================================
$ cvs diff -u -r1.16 -r1.16.4.1 shatest.c
--- openssl/crypto/sha/shatest.c 30 Apr 2005 21:51:41 -0000 1.16
+++ openssl/crypto/sha/shatest.c 16 Dec 2007 17:10:11 -0000 1.16.4.1
@@ -106,7 +106,7 @@
int main(int argc, char *argv[])
{
int i,err=0;
- unsigned char **P,**R;
+ char **P,**R;
static unsigned char buf[1000];
char *p,*r;
EVP_MD_CTX c;
@@ -118,8 +118,8 @@
#endif
EVP_MD_CTX_init(&c);
- P=(unsigned char **)test;
- R=(unsigned char **)ret;
+ P=test;
+ R=ret;
i=1;
while (*P != NULL)
{
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@openssl.org
Automated List Manager majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic