generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generate just one error code if iterated SSL_CTX_get() fails.

Browse Source 
Avoid enabled 'assert()' in production library.
This commit is contained in:
Bodo Möller
2000-02-05 19:29:00 +00:00
parent 6535eb1728
commit 37e48b88ad
12 changed files with 109 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/des/Makefile.ssl
View File

@@ -189,7 +189,7 @@ pcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h
qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
qud_cksm.o: ../../include/openssl/opensslconf.h des_locl.h
rand_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
rand_key.o: ../../include/openssl/opensslconf.h des_locl.h
rand_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
read2pwd.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
read2pwd.o: ../../include/openssl/opensslconf.h des_locl.h
read_pwd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

2
crypto/des/des.h
View File

@@ -186,7 +186,7 @@ void des_pcbc_encrypt(const unsigned char *input,unsigned char *output,
DES_LONG des_quad_cksum(const unsigned char *input,des_cblock output[],
long length,int out_count,des_cblock *seed);
void des_random_seed(des_cblock *key);
void des_random_key(des_cblock *ret);
int des_random_key(des_cblock *ret);
int des_read_password(des_cblock *key,const char *prompt,int verify);
int des_read_2passwords(des_cblock *key1,des_cblock *key2,
const char *prompt,int verify);

5
crypto/des/rand_key.c
View File

@@ -61,8 +61,9 @@ void des_random_seed(des_cblock *key)
RAND_seed(key, sizeof(des_cblock));
}
void des_random_key(des_cblock *ret)
int des_random_key(des_cblock *ret)
{
RAND_bytes((unsigned char *)ret, sizeof(des_cblock));
int r = RAND_bytes((unsigned char *)ret, sizeof(des_cblock));
des_set_odd_parity(ret);
return r;
}