diff --git a/CHANGES b/CHANGES index 5dcd6d8046973cc2149adc2d2b27307ad69d0f5e..247d65a001df52ee1554eb593e8f720f3c740084 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,14 @@ Changes between 0.9.4 and 0.9.5 [xx XXX 1999] + *) Add variants des_set_key_checked and des_set_key_unchecked of + des_set_key (aka des_key_sched). Global variable des_check_key + decides which of these is called by des_set_key; this way + des_check_key behaves as it always did, but applications and + the library itself, which was buggy for des_check_key == 1, + have a cleaner way to pick the version they need. + [Bodo Moeller] + *) New function PKCS12_newpass() which changes the password of a PKCS12 structure. [Steve Henson] diff --git a/apps/speed.c b/apps/speed.c index 779ee03a195bfb5f9b0fa925ff6859821512466d..caf47e22775205bccd50525c55bb308802661e2c 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -590,9 +590,9 @@ int MAIN(int argc, char **argv) #endif #ifndef NO_DES - des_set_key(&key,sch); - des_set_key(&key2,sch2); - des_set_key(&key3,sch3); + des_set_key_unchecked(&key,sch); + des_set_key_unchecked(&key2,sch2); + des_set_key_unchecked(&key3,sch3); #endif #ifndef NO_IDEA idea_set_encrypt_key(key16,&idea_ks); diff --git a/crypto/des/des.c b/crypto/des/des.c index 206e3777a78c994f0c376b75e4d2e6d3b449aef3..5cd337301a399c81e0793180119437fff885fce5 100644 --- a/crypto/des/des.c +++ b/crypto/des/des.c @@ -425,7 +425,7 @@ void doencryption(void) else k2[i-8]=k; } - des_set_key(&k2,ks2); + des_set_key_unchecked(&k2,ks2); memset(k2,0,sizeof(k2)); } else if (longk || flag3) @@ -433,7 +433,7 @@ void doencryption(void) if (flag3) { des_string_to_2keys(key,&kk,&k2); - des_set_key(&k2,ks2); + des_set_key_unchecked(&k2,ks2); memset(k2,0,sizeof(k2)); } else @@ -455,7 +455,7 @@ void doencryption(void) kk[i]=key[i]|0x80; } - des_set_key(&kk,ks); + des_set_key_unchecked(&kk,ks); memset(key,0,sizeof(key)); memset(kk,0,sizeof(kk)); /* woops - A bug that does not showup under unix :-( */ diff --git a/crypto/des/des.h b/crypto/des/des.h index 67f90aaf172feb90ea0af01dc74073ee828070fb..b492002435f8364c550b9ed587791af4eb648080 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -193,8 +193,13 @@ int des_read_2passwords(des_cblock *key1,des_cblock *key2, int des_read_pw_string(char *buf,int length,const char *prompt,int verify); void des_set_odd_parity(des_cblock *key); int des_is_weak_key(const_des_cblock *key); +/* des_set_key (= set_key = des_key_sched = key_sched) calls + * des_set_key_checked if global variable des_check_key is set, + * des_set_key_unchecked otherwise. */ int des_set_key(const_des_cblock *key,des_key_schedule schedule); int des_key_sched(const_des_cblock *key,des_key_schedule schedule); +int des_set_key_checked(const_des_cblock *key,des_key_schedule schedule); +void des_set_key_unchecked(const_des_cblock *key,des_key_schedule schedule); void des_string_to_key(const char *str,des_cblock *key); void des_string_to_2keys(const char *str,des_cblock *key1,des_cblock *key2); void des_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c index 746c456f8fab381973a080d70bb1a62574b12f9c..545075ce49d5f13e29797a914c47b0acf8a03df1 100644 --- a/crypto/des/des_opts.c +++ b/crypto/des/des_opts.c @@ -438,13 +438,13 @@ int main(int argc, char **argv) fprintf(stderr,"program when this computer is idle.\n"); #endif - des_set_key(&key,sch); - des_set_key(&key2,sch2); - des_set_key(&key3,sch3); + des_set_key_unchecked(&key,sch); + des_set_key_unchecked(&key2,sch2); + des_set_key_unchecked(&key3,sch3); #ifndef SIGALRM fprintf(stderr,"First we calculate the approximate speed ...\n"); - des_set_key(&key,sch); + des_set_key_unchecked(&key,sch); count=10; do { long i; diff --git a/crypto/des/destest.c b/crypto/des/destest.c index 69155eda129b250ac4c7dd30bf5e229f4961a343..7efd83dc30d77a9ad5e429d97cefbb0d297775f7 100644 --- a/crypto/des/destest.c +++ b/crypto/des/destest.c @@ -234,7 +234,8 @@ static unsigned char cipher_ecb2[NUM_TESTS-1][8]={ {0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}}; static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; -static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87}; +/* static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87}; */ +static unsigned char cbc2_key[8]={0xf1,0xe0,0xd3,0xc2,0xb5,0xa4,0x97,0x86}; static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10}; static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10}; /* Changed the following text constant to binary so it will work on ebcdic @@ -331,17 +332,17 @@ int main(int argc, char *argv[]) #ifndef NO_DESCBCM printf("Doing cbcm\n"); - if ((j=des_key_sched(&cbc_key,ks)) != 0) + if ((j=des_set_key_checked(&cbc_key,ks)) != 0) { printf("Key error %d\n",j); err=1; } - if ((j=des_key_sched(&cbc2_key,ks2)) != 0) + if ((j=des_set_key_checked(&cbc2_key,ks2)) != 0) { printf("Key error %d\n",j); err=1; } - if ((j=des_key_sched(&cbc3_key,ks3)) != 0) + if ((j=des_set_key_checked(&cbc3_key,ks3)) != 0) { printf("Key error %d\n",j); err=1; @@ -385,11 +386,7 @@ int main(int argc, char *argv[]) printf("Doing ecb\n"); for (i=0; ides_key,ks); + des_set_key_unchecked(&desp->des_key,ks); enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT; if (desp->des_mode == CBC) diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index 52553a4c1665617bdda81ca2e8c2f4a9ddfd528f..eb64bd5292711dc524f63d4b8f980222f64156fd 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -145,11 +145,34 @@ int des_is_weak_key(const_des_cblock *key) #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\ (a)=(a)^(t)^(t>>(16-(n)))) +int des_set_key(const_des_cblock *key, des_key_schedule schedule) + { + if (des_check_key) + { + return des_set_key_checked(key, schedule); + } + else + { + des_set_key_unchecked(key, schedule); + return 0; + } + } + /* return 0 if key parity is odd (correct), * return -1 if key parity error, * return -2 if illegal weak key. */ -int des_set_key(const_des_cblock *key, des_key_schedule schedule) +int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule) + { + if (!check_parity(key)) + return(-1); + if (des_is_weak_key(key)) + return(-2); + des_set_key_unchecked(key, schedule); + return 0; + } + +void des_set_key_unchecked(const_des_cblock *key, des_key_schedule schedule) { static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; register DES_LONG c,d,t,s,t2; @@ -157,15 +180,6 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule) register DES_LONG *k; register int i; - if (des_check_key) - { - if (!check_parity(key)) - return(-1); - - if (des_is_weak_key(key)) - return(-2); - } - k = &schedule->ks.deslong[0]; in = &(*key)[0]; @@ -225,7 +239,6 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule) t2=((s>>16L)|(t&0xffff0000L)); *(k++)=ROTATE(t2,26)&0xffffffffL; } - return(0); } int des_key_sched(const_des_cblock *key, des_key_schedule schedule) diff --git a/crypto/des/speed.c b/crypto/des/speed.c index da41abcb03dafc2c8881620ac0933ab6ec6fbb79..652cf5b03c6d54655e28e7354d7fea888fb770e3 100644 --- a/crypto/des/speed.c +++ b/crypto/des/speed.c @@ -190,12 +190,12 @@ int main(int argc, char **argv) printf("program when this computer is idle.\n"); #endif - des_set_key(&key2,sch2); - des_set_key(&key3,sch3); + des_set_key_unchecked(&key2,sch2); + des_set_key_unchecked(&key3,sch3); #ifndef SIGALRM printf("First we calculate the approximate speed ...\n"); - des_set_key(&key,sch); + des_set_key_unchecked(&key,sch); count=10; do { long i; @@ -225,7 +225,7 @@ int main(int argc, char **argv) Time_F(START); for (count=0,run=1; COND(ca); count++) - des_set_key(&key,sch); + des_set_key_unchecked(&key,sch); d=Time_F(STOP); printf("%ld set_key's in %.2f seconds\n",count,d); a=((double)COUNT(ca))/d; diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index 24841452f1fd664f9afd6721c6eed5d709c35ed7..55228249526bf199262e4783ecfc3f8db9e2e3b1 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c @@ -58,8 +58,6 @@ #include "des_locl.h" -OPENSSL_EXTERN int des_check_key; - void des_string_to_key(const char *str, des_cblock *key) { des_key_schedule ks; @@ -88,10 +86,7 @@ void des_string_to_key(const char *str, des_cblock *key) } #endif des_set_odd_parity(key); - i=des_check_key; - des_check_key=0; - des_set_key(key,ks); - des_check_key=i; + des_set_key_unchecked(key,ks); des_cbc_cksum((unsigned char*)str,key,length,ks,key); memset(ks,0,sizeof(ks)); des_set_odd_parity(key); @@ -150,13 +145,10 @@ void des_string_to_2keys(const char *str, des_cblock *key1, des_cblock *key2) #endif des_set_odd_parity(key1); des_set_odd_parity(key2); - i=des_check_key; - des_check_key=0; - des_set_key(key1,ks); + des_set_key_unchecked(key1,ks); des_cbc_cksum((unsigned char*)str,key1,length,ks,key1); - des_set_key(key2,ks); + des_set_key_unchecked(key2,ks); des_cbc_cksum((unsigned char*)str,key2,length,ks,key2); - des_check_key=i; memset(ks,0,sizeof(ks)); des_set_odd_parity(key1); des_set_odd_parity(key2); diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c index 02ccc6dc907a834684607203492e8fe777ffaed9..5d16b865c58e84afd3db1cb92e54342e4f99a01f 100644 --- a/crypto/evp/e_cbc_3d.c +++ b/crypto/evp/e_cbc_3d.c @@ -115,8 +115,8 @@ static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); memcpy( (char *)ctx->c.des_ede.ks3, (char *)ctx->c.des_ede.ks1, sizeof(ctx->c.des_ede.ks1)); @@ -134,9 +134,9 @@ static void des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); - des_set_key(&deskey[2],ctx->c.des_ede.ks3); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[2],ctx->c.des_ede.ks3); } } diff --git a/crypto/evp/e_cfb_3d.c b/crypto/evp/e_cfb_3d.c index bd32b072e2bc5f87fb93013a917c43eef9e109ee..b364bd4e318d44c5fc9745fe6cdf5d081d4cb4f4 100644 --- a/crypto/evp/e_cfb_3d.c +++ b/crypto/evp/e_cfb_3d.c @@ -116,8 +116,8 @@ static void des_ede_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); memcpy( (char *)ctx->c.des_ede.ks3, (char *)ctx->c.des_ede.ks1, sizeof(ctx->c.des_ede.ks1)); @@ -136,9 +136,9 @@ static void des_ede3_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); - des_set_key(&deskey[2],ctx->c.des_ede.ks3); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[2],ctx->c.des_ede.ks3); } } diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c index 6bdf20b6460f567690ebc09faff5ad6f9ff13a28..9e1714bd15dad9f5c6b17c5ea16191ccd1845791 100644 --- a/crypto/evp/e_cfb_d.c +++ b/crypto/evp/e_cfb_d.c @@ -95,7 +95,7 @@ static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->oiv[0]),iv,8); memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) - des_set_key(deskey,ctx->c.des_ks); + des_set_key_unchecked(deskey,ctx->c.des_ks); } static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, diff --git a/crypto/evp/e_ecb_3d.c b/crypto/evp/e_ecb_3d.c index 354a8b79a7974089e68875c951aadda6451144c3..806e971d36984739a9bd876ac37269fbd0a47347 100644 --- a/crypto/evp/e_ecb_3d.c +++ b/crypto/evp/e_ecb_3d.c @@ -110,8 +110,8 @@ static void des_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); memcpy( (char *)ctx->c.des_ede.ks3, (char *)ctx->c.des_ede.ks1, sizeof(ctx->c.des_ede.ks1)); @@ -125,9 +125,9 @@ static void des_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); - des_set_key(&deskey[2],ctx->c.des_ede.ks3); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[2],ctx->c.des_ede.ks3); } } diff --git a/crypto/evp/e_ecb_d.c b/crypto/evp/e_ecb_d.c index 5fb4e64b1cadbc9a7811fdfba7462bf6581e1b55..c11bef55efc1213de5e11f51c7acb31934ae5df1 100644 --- a/crypto/evp/e_ecb_d.c +++ b/crypto/evp/e_ecb_d.c @@ -90,7 +90,7 @@ static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, des_cblock *deskey = (des_cblock *)key; if (deskey != NULL) - des_set_key(deskey,ctx->c.des_ks); + des_set_key_unchecked(deskey,ctx->c.des_ks); } static void des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, diff --git a/crypto/evp/e_ofb_3d.c b/crypto/evp/e_ofb_3d.c index 5233567c0cc098a3edac01014f359341097b0939..d1a33e2ecd5044690f450dc2d449ffe8291765cd 100644 --- a/crypto/evp/e_ofb_3d.c +++ b/crypto/evp/e_ofb_3d.c @@ -116,8 +116,8 @@ static void des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); memcpy( (char *)ctx->c.des_ede.ks3, (char *)ctx->c.des_ede.ks1, sizeof(ctx->c.des_ede.ks1)); @@ -136,9 +136,9 @@ static void des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) { - des_set_key(&deskey[0],ctx->c.des_ede.ks1); - des_set_key(&deskey[1],ctx->c.des_ede.ks2); - des_set_key(&deskey[2],ctx->c.des_ede.ks3); + des_set_key_unchecked(&deskey[0],ctx->c.des_ede.ks1); + des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2); + des_set_key_unchecked(&deskey[2],ctx->c.des_ede.ks3); } } diff --git a/crypto/evp/e_ofb_d.c b/crypto/evp/e_ofb_d.c index 398b3a002ea1c932ec7f6adf226890e2ce7d2cd1..d51ce230f4d83231583d0a72cc9ac8205fe1abec 100644 --- a/crypto/evp/e_ofb_d.c +++ b/crypto/evp/e_ofb_d.c @@ -95,7 +95,7 @@ static void des_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->oiv[0]),iv,8); memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) - des_set_key(deskey,ctx->c.des_ks); + des_set_key_unchecked(deskey,ctx->c.des_ks); } static void des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c index 3a6628a75c9aee129a690dca9ec111ba56997011..7568fad4ff76a6e023828ff3ca339b45b1384c50 100644 --- a/crypto/evp/e_xcbc_d.c +++ b/crypto/evp/e_xcbc_d.c @@ -94,7 +94,7 @@ static void desx_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) { - des_set_key(deskey,ctx->c.desx_cbc.ks); + des_set_key_unchecked(deskey,ctx->c.desx_cbc.ks); memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8); memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8); } diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c index 4fc39ed86cfd22ca2817734ab82acfc2b7f05417..aed715c69d90dbe4df5eba9f27f0692cfdb80c08 100644 --- a/crypto/mdc2/mdc2dgst.c +++ b/crypto/mdc2/mdc2dgst.c @@ -135,11 +135,11 @@ static void mdc2_body(MDC2_CTX *c, unsigned char *in, unsigned int len) c->hh[0]=(c->hh[0]&0x9f)|0x20; des_set_odd_parity(&c->h); - des_set_key(&c->h,k); + des_set_key_unchecked(&c->h,k); des_encrypt(d,k,1); des_set_odd_parity(&c->hh); - des_set_key(&c->hh,k); + des_set_key_unchecked(&c->hh,k); des_encrypt(dd,k,1); ttin0=tin0^dd[0];