diff options
| author | Moritz Schulte <mo@g10code.com> | 2003-04-27 19:22:29 +0000 |
|---|---|---|
| committer | Moritz Schulte <mo@g10code.com> | 2003-04-27 19:22:29 +0000 |
| commit | c48f80823fb96a4276d80187b42ef3aee4990a7b (patch) | |
| tree | 41f544d91ffdfa75db05b6c670e1b67c95001ac6 /cipher/des.c | |
| parent | 55ddea17ae11d69b6fc1a4ff402e5e5b011d28af (diff) | |
| download | libgcrypt-c48f80823fb96a4276d80187b42ef3aee4990a7b.tar.gz | |
2003-04-27 Moritz Schulte <moritz@g10code.com>
* md.c (gcry_md_get_algo_dlen): Simplified, simply call
md_digest_length to do the job.
* des.c (do_des_setkey): Check for selftest failure not only
during initialization.
(do_tripledes_setkey): Include check for selftest failure.
Diffstat (limited to 'cipher/des.c')
| -rw-r--r-- | cipher/des.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cipher/des.c b/cipher/des.c index 79de0e04..250818e1 100644 --- a/cipher/des.c +++ b/cipher/des.c @@ -1024,11 +1024,12 @@ do_des_setkey (void *context, const byte *key, unsigned keylen) { initialized = 1; selftest_failed = selftest (); + if (selftest_failed) - log_error ("%s\n", selftest_failed); - if (selftest_failed) - return GCRYERR_SELFTEST; - } + log_error ("%s\n", selftest_failed); + } + if (selftest_failed) + return GCRYERR_SELFTEST; if (keylen != 8) return GCRYERR_INV_KEYLEN; |