summaryrefslogtreecommitdiff
path: root/cipher/des.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-11-13 16:43:20 +0000
committerWerner Koch <wk@gnupg.org>1999-11-13 16:43:20 +0000
commitf0ea5ed32081cfb734eae236a21a73f179c59e69 (patch)
tree8525a739a443756fbb29ca5280b9f7adc5bde3ff /cipher/des.c
parentf36733037c144e888d4d7190eb123b375e265dd4 (diff)
downloadlibgcrypt-f0ea5ed32081cfb734eae236a21a73f179c59e69.tar.gz
See ChangeLog: Sat Nov 13 17:44:23 CET 1999 Werner Koch
Diffstat (limited to 'cipher/des.c')
-rw-r--r--cipher/des.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cipher/des.c b/cipher/des.c
index c2ca3f84..af5b5845 100644
--- a/cipher/des.c
+++ b/cipher/des.c
@@ -116,7 +116,7 @@
#include <stdio.h>
#include <string.h> /* memcpy, memcmp */
#include "types.h" /* for byte and u32 typedefs */
-#include "errors.h"
+#include "g10lib.h"
#include "des.h"
#if defined(__GNUC__) && defined(__GNU_LIBRARY__)
@@ -558,7 +558,7 @@ des_setkey (struct _des_ctx *ctx, const byte * key)
int i;
if( selftest_failed )
- return G10ERR_SELFTEST_FAILED;
+ return GCRYERR_SELFTEST;
des_key_schedule (key, ctx->encrypt_subkeys);
@@ -944,14 +944,14 @@ static int
do_tripledes_setkey ( struct _tripledes_ctx *ctx, byte *key, unsigned keylen )
{
if( selftest_failed )
- return G10ERR_SELFTEST_FAILED;
+ return GCRYERR_SELFTEST;
if( keylen != 24 )
- return G10ERR_WRONG_KEYLEN;
+ return GCRYERR_INV_KEYLEN;
tripledes_set3keys ( ctx, key, key+8, key+16);
if( is_weak_key( key ) || is_weak_key( key+8 ) || is_weak_key( key+16 ) )
- return G10ERR_WEAK_KEY;
+ return GCRYERR_WEAK_KEY;
return 0;
}