Recent changes from 0.9.7-stable
This commit is contained in:
parent
326e02b260
commit
ee2cffeb56
@ -146,10 +146,10 @@ my %table=(
|
|||||||
"debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
|
"debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
|
||||||
"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
|
"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
|
||||||
"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::dlfcn",
|
"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::dlfcn",
|
||||||
"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -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-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wmissing-prototypes -Wno-long-long -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_CTX_DEBUG -DCRYPTO_MDEBUG -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 -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wmissing-prototypes -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||||
"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -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-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wmissing-prototypes -Wconversion -Wno-long-long -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-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wmissing-prototypes -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||||
"dist", "cc:-O::(unknown)::::::",
|
"dist", "cc:-O::(unknown)::::::",
|
||||||
|
|
||||||
# Basic configs that should work on any (32 and less bit) box
|
# Basic configs that should work on any (32 and less bit) box
|
||||||
|
@ -220,7 +220,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
|
|||||||
return(NULL);
|
return(NULL);
|
||||||
|
|
||||||
p=(char *)s->data;
|
p=(char *)s->data;
|
||||||
if ((p == NULL) || (s->length < len))
|
if ((p == NULL) || ((size_t)s->length < len))
|
||||||
{
|
{
|
||||||
p=OPENSSL_malloc(len);
|
p=OPENSSL_malloc(len);
|
||||||
if (p == NULL) return(NULL);
|
if (p == NULL) return(NULL);
|
||||||
|
@ -200,7 +200,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
|
|||||||
return(NULL);
|
return(NULL);
|
||||||
|
|
||||||
p=(char *)s->data;
|
p=(char *)s->data;
|
||||||
if ((p == NULL) || (s->length < len))
|
if ((p == NULL) || ((size_t)s->length < len))
|
||||||
{
|
{
|
||||||
p=OPENSSL_malloc(len);
|
p=OPENSSL_malloc(len);
|
||||||
if (p == NULL) return(NULL);
|
if (p == NULL) return(NULL);
|
||||||
|
@ -72,8 +72,8 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
|
|||||||
int enc)
|
int enc)
|
||||||
{
|
{
|
||||||
register DES_LONG d0,d1,v0,v1;
|
register DES_LONG d0,d1,v0,v1;
|
||||||
register unsigned long l=length;
|
register unsigned long l=length,n=(numbits+7)/8;
|
||||||
register int num=numbits,n=(numbits+7)/8,i;
|
register int num=numbits,i;
|
||||||
DES_LONG ti[2];
|
DES_LONG ti[2];
|
||||||
unsigned char *iv;
|
unsigned char *iv;
|
||||||
unsigned char ovec[16];
|
unsigned char ovec[16];
|
||||||
|
@ -163,6 +163,8 @@ void OpenSSL_add_all_ciphers(void)
|
|||||||
EVP_add_cipher(EVP_aes_192_ecb());
|
EVP_add_cipher(EVP_aes_192_ecb());
|
||||||
EVP_add_cipher(EVP_aes_192_cbc());
|
EVP_add_cipher(EVP_aes_192_cbc());
|
||||||
EVP_add_cipher(EVP_aes_192_cfb());
|
EVP_add_cipher(EVP_aes_192_cfb());
|
||||||
|
EVP_add_cipher(EVP_aes_192_cfb1());
|
||||||
|
EVP_add_cipher(EVP_aes_192_cfb8());
|
||||||
EVP_add_cipher(EVP_aes_192_ofb());
|
EVP_add_cipher(EVP_aes_192_ofb());
|
||||||
#if 0
|
#if 0
|
||||||
EVP_add_cipher(EVP_aes_192_ctr());
|
EVP_add_cipher(EVP_aes_192_ctr());
|
||||||
@ -172,6 +174,8 @@ void OpenSSL_add_all_ciphers(void)
|
|||||||
EVP_add_cipher(EVP_aes_256_ecb());
|
EVP_add_cipher(EVP_aes_256_ecb());
|
||||||
EVP_add_cipher(EVP_aes_256_cbc());
|
EVP_add_cipher(EVP_aes_256_cbc());
|
||||||
EVP_add_cipher(EVP_aes_256_cfb());
|
EVP_add_cipher(EVP_aes_256_cfb());
|
||||||
|
EVP_add_cipher(EVP_aes_256_cfb1());
|
||||||
|
EVP_add_cipher(EVP_aes_256_cfb8());
|
||||||
EVP_add_cipher(EVP_aes_256_ofb());
|
EVP_add_cipher(EVP_aes_256_ofb());
|
||||||
#if 0
|
#if 0
|
||||||
EVP_add_cipher(EVP_aes_256_ctr());
|
EVP_add_cipher(EVP_aes_256_ctr());
|
||||||
|
@ -110,6 +110,7 @@ int RAND_load_file(const char *file, long bytes)
|
|||||||
|
|
||||||
in=fopen(file,"rb");
|
in=fopen(file,"rb");
|
||||||
if (in == NULL) goto err;
|
if (in == NULL) goto err;
|
||||||
|
#if defined(S_IFBLK) && defined(S_IFCHR)
|
||||||
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
|
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
|
||||||
/* this file is a device. we don't want read an infinite number
|
/* this file is a device. we don't want read an infinite number
|
||||||
* of bytes from a random device, nor do we want to use buffered
|
* of bytes from a random device, nor do we want to use buffered
|
||||||
@ -118,6 +119,7 @@ int RAND_load_file(const char *file, long bytes)
|
|||||||
bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */
|
bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */
|
||||||
setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */
|
setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
if (bytes > 0)
|
if (bytes > 0)
|
||||||
@ -151,6 +153,7 @@ int RAND_write_file(const char *file)
|
|||||||
|
|
||||||
i=stat(file,&sb);
|
i=stat(file,&sb);
|
||||||
if (i != -1) {
|
if (i != -1) {
|
||||||
|
#if defined(S_IFBLK) && defined(S_IFCHR)
|
||||||
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
|
if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
|
||||||
/* this file is a device. we don't write back to it.
|
/* this file is a device. we don't write back to it.
|
||||||
* we "succeed" on the assumption this is some sort
|
* we "succeed" on the assumption this is some sort
|
||||||
@ -159,6 +162,7 @@ int RAND_write_file(const char *file)
|
|||||||
*/
|
*/
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
|
#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user