diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-02-05 19:29:00 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-02-05 19:29:00 +0000 |
| commit | 37e48b88adda9334fedf83e18f1bff72b4b9c8cf (patch) | |
| tree | c5365692bc3f939dc08fcbcc5c09c58b4290409f /crypto/des | |
| parent | 6535eb1728a7d30673d0a95da5fd18126b7d0b71 (diff) | |
Generate just one error code if iterated SSL_CTX_get() fails.
Avoid enabled 'assert()' in production library.
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/des/des.h | 2 | ||||
| -rw-r--r-- | crypto/des/rand_key.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl index 16eeb940dd..e6a4c7cd8a 100644 --- a/crypto/des/Makefile.ssl +++ b/crypto/des/Makefile.ssl @@ -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 diff --git a/crypto/des/des.h b/crypto/des/des.h index b492002435..98a9c4127c 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -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); diff --git a/crypto/des/rand_key.c b/crypto/des/rand_key.c index a63e8411bb..7816a8f25c 100644 --- a/crypto/des/rand_key.c +++ b/crypto/des/rand_key.c @@ -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; } |