diff for duplicates of <200906081332.10608.jarod@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 3b0917a..435e385 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,3 +32,15 @@ index 4aba83b..2bc479a 100644 if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) && memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2], - DES_KEY_SIZE))) { +- +- *flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED; ++ DES_KEY_SIZE)) && ++ (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) { ++ *flags |= CRYPTO_TFM_RES_WEAK_KEY; + return -EINVAL; + } + for (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) { + +-- +Jarod Wilson +jarod@redhat.com diff --git a/a/content_digest b/N1/content_digest index 5e14b48..424b97d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -40,6 +40,18 @@ " \n" " \tif (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&\n" " \t memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],\n" - "-\t\t DES_KEY_SIZE))) {" + "-\t\t DES_KEY_SIZE))) {\n" + "-\n" + "-\t\t*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;\n" + "+\t\t DES_KEY_SIZE)) &&\n" + "+\t (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {\n" + "+\t\t*flags |= CRYPTO_TFM_RES_WEAK_KEY;\n" + " \t\treturn -EINVAL;\n" + " \t}\n" + " \tfor (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) {\n" + "\n" + "-- \n" + "Jarod Wilson\n" + jarod@redhat.com -f9b8ec665b1de235fe636ce5e22757a4db24139ee10dc61d7c23d5b55ec2e7d8 +a8c993c05365bc5c91446b0e0bceab7b2657e1f121fbc032a4325949396edd02
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.