X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdes%2Fset_key.c;h=adbad72362f53eee58b6d4a58c5996c0a56e52a5;hb=cd5e2b0a689a7b22bd470e70ed0b8c84305d6d03;hp=135665b04648e106875f8a82d39120c9f870bafd;hpb=e3713c365c2657236439fea00822a43aa396d112;p=oweals%2Fopenssl.git diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index 135665b046..adbad72362 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -64,7 +64,7 @@ int DES_check_key_parity(const_DES_cblock *key) for (i = 0; i < DES_KEY_SZ; i++) { if ((*key)[i] != odd_parity[(*key)[i]]) - return (0); + return 0; } return 1; } @@ -106,7 +106,7 @@ int DES_is_weak_key(const_DES_cblock *key) for (i = 0; i < NUM_WEAK_KEY; i++) if (memcmp(weak_keys[i], key, sizeof(DES_cblock)) == 0) return 1; - return (0); + return 0; } /*- @@ -293,9 +293,9 @@ 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 (!DES_check_key_parity(key)) - return (-1); + return -1; if (DES_is_weak_key(key)) - return (-2); + return -2; DES_set_key_unchecked(key, schedule); return 0; } @@ -310,7 +310,7 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) register int i; #ifdef OPENBSD_DEV_CRYPTO - memcpy(schedule->key, key, sizeof schedule->key); + memcpy(schedule->key, key, sizeof(schedule->key)); schedule->session = NULL; #endif k = &schedule->ks->deslong[0]; @@ -368,5 +368,5 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule) { - return (DES_set_key(key, schedule)); + return DES_set_key(key, schedule); }