diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 14:53:03 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 14:53:03 +0200 |
commit | 8afc069c742f80d3e383ba3d0e38697aeeeb147b (patch) | |
tree | 4c010eac56a1d6958e7c86d97579be6338552d51 /ncr-key.c | |
parent | 3d758323280763fe59b1f61d4f86aa2a29fe3775 (diff) | |
parent | c5fb18ff697aefb156dfebe87ded77a9e1371c45 (diff) | |
download | kernel-crypto-ncr-standalone-master.tar.gz kernel-crypto-ncr-standalone-master.tar.xz kernel-crypto-ncr-standalone-master.zip |
Merge remote branch 'standalone/master' into standalone-masterncr-standalone-master
Diffstat (limited to 'ncr-key.c')
-rw-r--r-- | ncr-key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ncr-key.c b/ncr-key.c index 406e03299c3..8e082d169a2 100644 --- a/ncr-key.c +++ b/ncr-key.c @@ -558,7 +558,7 @@ int bits; /* FIXME: should we move everything here into algorithm properties? */ if (item->type == NCR_KEY_TYPE_SECRET) { - if (item->algorithm->algo == NCR_ALG_3DES_CBC) + if (item->algorithm->algo == NCR_ALG_3DES_CBC || item->algorithm->algo == NCR_ALG_3DES_ECB) return 112; return item->key.secret.size*8; |