diff options
| author | Tom Yu <tlyu@mit.edu> | 1998-11-12 22:21:20 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1998-11-12 22:21:20 +0000 |
| commit | 036f289eb519b5809499de654857caaef222db9a (patch) | |
| tree | 21640ba831b16726555769876220a5744bc9579e /src/lib/des425 | |
| parent | 50b503bc9ba34b0d3eeea3f4bf3932f93d179480 (diff) | |
| download | krb5-036f289eb519b5809499de654857caaef222db9a.zip krb5-036f289eb519b5809499de654857caaef222db9a.tar.gz krb5-036f289eb519b5809499de654857caaef222db9a.tar.bz2 | |
* Makefile.in (STLIBOBJS, OBJS, SRCS): Restore des.c
* des.c: Restore des_ecb_encrypt and make it use the cbc
interface.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11022 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/des425')
| -rw-r--r-- | src/lib/des425/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/des425/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/des425/des.c | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 4eeef10..e873b5f 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 12 17:20:25 1998 Tom Yu <tlyu@mit.edu> + + * Makefile.in (STLIBOBJS, OBJS, SRCS): Restore des.c + + * des.c: Restore des_ecb_encrypt and make it use the cbc + interface. + 1998-10-27 Marc Horowitz <marc@mit.edu> * random_key.c, new_rnd_key.c: make the v4 compat random key code diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index e96e03f..f19fc2b 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -27,6 +27,7 @@ SHLIB_RDIRS=$(KRB5_LIBDIR) STOBJLISTS=OBJS.ST STLIBOBJS=cksum.o \ + des.o \ enc_dec.o \ key_parity.o \ key_sched.o \ @@ -43,6 +44,7 @@ STLIBOBJS=cksum.o \ OBJS= cksum.$(OBJEXT) \ + des.$(OBJEXT) \ enc_dec.$(OBJEXT) \ key_parity.$(OBJEXT) \ key_sched.$(OBJEXT) \ @@ -58,6 +60,7 @@ OBJS= cksum.$(OBJEXT) \ k4_glue.$(OBJEXT) SRCS= $(srcdir)/cksum.c \ + $(srcdir)/des.c \ $(srcdir)/enc_dec.c \ $(srcdir)/key_parity.c \ $(srcdir)/key_sched.c \ diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c index 6b08899..b5db9dd 100644 --- a/src/lib/des425/des.c +++ b/src/lib/des425/des.c @@ -58,10 +58,9 @@ des_ecb_encrypt(clear, cipher, schedule, encrypt) int encrypt; /* 0 ==> decrypt, else encrypt */ register mit_des_key_schedule schedule; /* r11 */ { - return (mit_des_ecb_encrypt((const mit_des_cblock FAR *) clear, - (mit_des_cblock *) cipher, - schedule, - encrypt)); -} - + static des_cblock iv; + return (mit_des_cbc_encrypt((const des_cblock *) clear, + (des_cblock *) cipher, + 8, schedule, iv, encrypt)); +} |