=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/Attic/enc_des.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- src/usr.bin/telnet/Attic/enc_des.c 2005/05/24 03:43:56 1.1 +++ src/usr.bin/telnet/Attic/enc_des.c 2010/10/15 10:18:42 1.2 @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_des.c,v 1.1 2005/05/24 03:43:56 deraadt Exp $ */ +/* $OpenBSD: enc_des.c,v 1.2 2010/10/15 10:18:42 jsg Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -39,7 +39,8 @@ #include "encrypt.h" #include "misc-proto.h" -#include +#include +#include extern int encrypt_debug_mode; @@ -55,19 +56,19 @@ struct stinfo { - des_cblock str_output; - des_cblock str_feed; - des_cblock str_iv; - des_cblock str_ikey; - des_key_schedule str_sched; + DES_cblock str_output; + DES_cblock str_feed; + DES_cblock str_iv; + DES_cblock str_ikey; + DES_key_schedule str_sched; int str_index; int str_flagshift; }; struct fb { - des_cblock krbdes_key; - des_key_schedule krbdes_sched; - des_cblock temp_feed; + DES_cblock krbdes_key; + DES_key_schedule krbdes_sched; + DES_cblock temp_feed; unsigned char fb_feed[64]; int need_start; int state[2]; @@ -105,13 +106,13 @@ #define FB64_IV_BAD 3 -void fb64_stream_iv (des_cblock, struct stinfo *); +void fb64_stream_iv (DES_cblock, struct stinfo *); void fb64_init (struct fb *); static int fb64_start (struct fb *, int, int); int fb64_is (unsigned char *, int, struct fb *); int fb64_reply (unsigned char *, int, struct fb *); static void fb64_session (Session_Key *, int, struct fb *); -void fb64_stream_key (des_cblock, struct stinfo *); +void fb64_stream_key (DES_cblock, struct stinfo *); int fb64_keyid (int, unsigned char *, int *, struct fb *); void cfb64_init(int server) @@ -197,27 +198,21 @@ /* * Create a random feed and send it over. */ -#ifndef OLD_DES_RANDOM_KEY - des_new_random_key(&fbp->temp_feed); -#else - /* - * From des_cryp.man "If the des_check_key flag is non-zero, - * des_set_key will check that the key passed is - * of odd parity and is not a week or semi-weak key." - */ do { - des_random_key(fbp->temp_feed); - des_set_odd_parity(fbp->temp_feed); - } while (des_is_weak_key(fbp->temp_feed)); -#endif - des_ecb_encrypt(&fbp->temp_feed, + if (RAND_bytes(fbp->temp_feed, + sizeof(*fbp->temp_feed)) != 1) + abort(); + DES_set_odd_parity(&fbp->temp_feed); + } while(DES_is_weak_key(&fbp->temp_feed)); + + DES_ecb_encrypt(&fbp->temp_feed, &fbp->temp_feed, - fbp->krbdes_sched, 1); + &fbp->krbdes_sched, 1); p = fbp->fb_feed + 3; *p++ = ENCRYPT_IS; p++; *p++ = FB64_IV; - for (x = 0; x < sizeof(des_cblock); ++x) { + for (x = 0; x < sizeof(DES_cblock); ++x) { if ((*p++ = fbp->temp_feed[x]) == IAC) *p++ = IAC; } @@ -260,7 +255,7 @@ switch (*data++) { case FB64_IV: - if (cnt != sizeof(des_cblock)) { + if (cnt != sizeof(DES_cblock)) { if (encrypt_debug_mode) printf("CFB64: initial vector failed on size\r\n"); state = FAILED; @@ -349,7 +344,7 @@ break; case FB64_IV_BAD: - memset(fbp->temp_feed, 0, sizeof(des_cblock)); + memset(fbp->temp_feed, 0, sizeof(DES_cblock)); fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]); state = FAILED; break; @@ -387,18 +382,16 @@ key ? key->type : -1, SK_DES); return; } - memcpy(fbp->krbdes_key, key->data, sizeof(des_cblock)); + memcpy(fbp->krbdes_key, key->data, sizeof(DES_cblock)); fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT-1]); fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]); - if (fbp->once == 0) { -#ifndef OLD_DES_RANDOM_KEY - des_init_random_number_generator(&fbp->krbdes_key); -#endif - fbp->once = 1; - } - des_key_sched(&fbp->krbdes_key, fbp->krbdes_sched); + RAND_seed(key->data, key->length); + + DES_set_key_checked((DES_cblock *)&fbp->krbdes_key, + &fbp->krbdes_sched); + /* * Now look to see if krbdes_start() was was waiting for * the key to show up. If so, go ahead an call it now @@ -495,25 +488,25 @@ fb64_printsub(data, cnt, buf, buflen, "OFB64"); } -void fb64_stream_iv(des_cblock seed, struct stinfo *stp) +void fb64_stream_iv(DES_cblock seed, struct stinfo *stp) { - memcpy(stp->str_iv, seed,sizeof(des_cblock)); - memcpy(stp->str_output, seed, sizeof(des_cblock)); + memcpy(stp->str_iv, seed,sizeof(DES_cblock)); + memcpy(stp->str_output, seed, sizeof(DES_cblock)); - des_key_sched(&stp->str_ikey, stp->str_sched); + DES_key_sched(&stp->str_ikey, &stp->str_sched); - stp->str_index = sizeof(des_cblock); + stp->str_index = sizeof(DES_cblock); } -void fb64_stream_key(des_cblock key, struct stinfo *stp) +void fb64_stream_key(DES_cblock key, struct stinfo *stp) { - memcpy(stp->str_ikey, key, sizeof(des_cblock)); - des_key_sched((des_cblock*)key, stp->str_sched); + memcpy(stp->str_ikey, key, sizeof(DES_cblock)); + DES_key_sched((des_cblock*)key, &stp->str_sched); - memcpy(stp->str_output, stp->str_iv, sizeof(des_cblock)); + memcpy(stp->str_output, stp->str_iv, sizeof(DES_cblock)); - stp->str_index = sizeof(des_cblock); + stp->str_index = sizeof(DES_cblock); } /* @@ -545,10 +538,10 @@ index = stp->str_index; while (c-- > 0) { - if (index == sizeof(des_cblock)) { - des_cblock b; - des_ecb_encrypt(&stp->str_output, &b,stp->str_sched, 1); - memcpy(stp->str_feed, b, sizeof(des_cblock)); + if (index == sizeof(DES_cblock)) { + DES_cblock b; + DES_ecb_encrypt(&stp->str_output, &b, &stp->str_sched, 1); + memcpy(stp->str_feed, b, sizeof(DES_cblock)); index = 0; } @@ -577,10 +570,10 @@ } index = stp->str_index++; - if (index == sizeof(des_cblock)) { - des_cblock b; - des_ecb_encrypt(&stp->str_output,&b, stp->str_sched, 1); - memcpy(stp->str_feed, b, sizeof(des_cblock)); + if (index == sizeof(DES_cblock)) { + DES_cblock b; + DES_ecb_encrypt(&stp->str_output,&b, &stp->str_sched, 1); + memcpy(stp->str_feed, b, sizeof(DES_cblock)); stp->str_index = 1; /* Next time will be 1 */ index = 0; /* But now use 0 */ } @@ -617,10 +610,10 @@ index = stp->str_index; while (c-- > 0) { - if (index == sizeof(des_cblock)) { - des_cblock b; - des_ecb_encrypt(&stp->str_feed,&b, stp->str_sched, 1); - memcpy(stp->str_feed, b, sizeof(des_cblock)); + if (index == sizeof(DES_cblock)) { + DES_cblock b; + DES_ecb_encrypt(&stp->str_feed,&b, &stp->str_sched, 1); + memcpy(stp->str_feed, b, sizeof(DES_cblock)); index = 0; } *s++ ^= stp->str_feed[index]; @@ -646,10 +639,10 @@ } index = stp->str_index++; - if (index == sizeof(des_cblock)) { - des_cblock b; - des_ecb_encrypt(&stp->str_feed,&b,stp->str_sched, 1); - memcpy(stp->str_feed, b, sizeof(des_cblock)); + if (index == sizeof(DES_cblock)) { + DES_cblock b; + DES_ecb_encrypt(&stp->str_feed,&b, &stp->str_sched, 1); + memcpy(stp->str_feed, b, sizeof(DES_cblock)); stp->str_index = 1; /* Next time will be 1 */ index = 0; /* But now use 0 */ }