diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-09-06 15:00:17 +0200 |
| commit | c61c13594953d462597ed18d6c77e736878ff9d9 (patch) | |
| tree | 583b7cb956cb9fce6c630cc634e772942e3bbaf7 /crypto/userspace/ncr-key.c | |
| parent | 9cab3a1a9660ed5f798b063aa7e827eb0c95ba94 (diff) | |
| parent | 8afc069c742f80d3e383ba3d0e38697aeeeb147b (diff) | |
| download | kernel-crypto-ncr-standalone-rename.tar.gz kernel-crypto-ncr-standalone-rename.tar.xz kernel-crypto-ncr-standalone-rename.zip | |
Merge branch 'standalone-master' into standalone-renamencr-standalone-rename
Conflicts:
crypto/userspace/libtomcrypt/misc/qsort.c
crypto/userspace/libtommath/bn_mp_and.c
crypto/userspace/libtommath/bn_mp_exteuclid.c
crypto/userspace/libtommath/bn_mp_jacobi.c
crypto/userspace/libtommath/bn_mp_or.c
crypto/userspace/libtommath/bn_mp_prime_fermat.c
crypto/userspace/libtommath/bn_mp_radix_size.c
crypto/userspace/libtommath/bn_mp_radix_smap.c
crypto/userspace/libtommath/bn_mp_read_radix.c
crypto/userspace/libtommath/bn_mp_sqrt.c
crypto/userspace/libtommath/bn_mp_toradix.c
crypto/userspace/libtommath/bn_mp_toradix_n.c
crypto/userspace/libtommath/bn_mp_xor.c
examples/Makefile
examples/ncr.c
examples/pk.c
Diffstat (limited to 'crypto/userspace/ncr-key.c')
| -rw-r--r-- | crypto/userspace/ncr-key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/userspace/ncr-key.c b/crypto/userspace/ncr-key.c index 406e03299c3..8e082d169a2 100644 --- a/crypto/userspace/ncr-key.c +++ b/crypto/userspace/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; |