summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rhel5-patches' into integrationHEADncr-integrationMiloslav Trmač2010-09-071-1/+4
|\
| * Panic if FIPS rng test can't be set upncr-rhel5-patchesMiloslav Trmač2010-07-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | If in FIPS mode, failure to allocate a buffer for the continuous test would silently disable the test. Panic instead. This is originally a hunk from From: Neil Horman <nhorman@redhat.com> Date: Sat, 13 Jun 2009 14:19:10 -0400 Subject: [crypto] add continuous test to hw rng in FIPS mode Message-id: 20090613181910.GB24861@localhost.localdomain
* | Merge branch 'audit' into integrationMiloslav Trmač2010-09-0711-22/+588
|\ \
| * | Implement AUDIT_CRYPTO_KEY_VALUEncr-auditMiloslav Trmač2010-09-075-14/+197
| | |
| * | Implement AUDIT_CRYPTO_USERSPACE_OPMiloslav Trmač2010-09-078-4/+346
| | |
| * | Drop unnecessary checks for NULLMiloslav Trmač2010-09-061-6/+3
| | |
| * | Drop unnecessary checks for NULLMiloslav Trmač2010-09-061-4/+2
| | |
| * | Use the "ncr_lists *" type in cryptodev_main.cMiloslav Trmač2010-09-063-4/+4
| | |
| * | Implement AUDIT_CRYPTO_STORAGE_KEYMiloslav Trmač2010-09-062-4/+26
| | |
| * | Assign integer IDs to ncr.h contextsMiloslav Trmač2010-09-062-0/+24
| | |
* | | Merge remote branch 'standalone/bugfixes' into integrationMiloslav Trmač2010-09-070-0/+0
|\ \ \ | |/ / |/| | | | | | | | Conflicts: examples/pk.c
| * | Fix DH testMiloslav Trmač2010-09-061-1/+1
| | |
* | | Merge branch 'standalone-rename' into userspace-cryptoncr-userspace-cryptoMiloslav Trmač2010-09-0629-1209/+311
|\ \ \
| * \ \ Merge branch 'standalone-master' into standalone-renamencr-standalone-renameMiloslav Trmač2010-09-0631-1209/+311
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Merge remote branch 'standalone/master' into standalone-masterncr-standalone-masterMiloslav Trmač2010-09-0635-1412/+2163
| | |\| |
| | | * | Use the ncr_algorithm_t as an identifier for storage data. This will allowNikos Mavrogiannopoulos2010-09-054-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | keys tied to RSA-transparent, to be used for RSA operations as well (once keys are made tied to an algorithm).
| | | * | Added flag: NCR_KEY_FLAG_ALLOW_TRANSPARENT_HASHNikos Mavrogiannopoulos2010-09-054-9/+20
| | | | |
| | | * | 3DES-ECB has also effective key length of 112.Nikos Mavrogiannopoulos2010-09-051-1/+1
| | | | |
| | | * | Run DH key exchange for 100 times for testing.Nikos Mavrogiannopoulos2010-09-051-200/+226
| | | | |
| | | * | DH key generation moved to a while loop... Just in case.Nikos Mavrogiannopoulos2010-09-051-12/+14
| | | | |
| | | * | Key wrapping is privileged.Nikos Mavrogiannopoulos2010-09-051-0/+28
| | | | |
| | | * | Added flag NCR_KEY_FLAG_HASHABLE and enforced it when reading a key for hashing.Nikos Mavrogiannopoulos2010-09-053-1/+8
| | | | |
| | | * | Rationalized the key wrapping format. It currently is:Nikos Mavrogiannopoulos2010-09-053-76/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackedData ::= SEQUENCE { version INTEGER { v1(0) } algorithm OBJECT IDENTIFIER, type INTEGER { secret_key(0), public(1), private(2) }, data OCTET STRING } Unfortunately there are not assigned OIDs for all algorithms we support.
| | | * | Optimizations for 32bit machines by using a 64bit word type and 32bit digit.Nikos Mavrogiannopoulos2010-09-034-7/+16
| | | | | | | | | | | | | | | | | | | | Unfortunately we cannot do the same for 64bit since we don't have an 128bit type in kernel.
| | | * | Added a FIXME on the used types.Nikos Mavrogiannopoulos2010-09-021-0/+4
| | | | |
| | | * | Use the linux kernel heapsort instead of including qsort.Nikos Mavrogiannopoulos2010-09-026-252/+6
| | | | |
| | | * | Removed unneeded code.Nikos Mavrogiannopoulos2010-09-0213-845/+5
| | | | |
| | | * | Drop a redundant prototype.Miloslav Trmač2010-09-021-2/+0
| | | | |
| | | * | Added an emulation of a userspace application that provides encryption service.Nikos Mavrogiannopoulos2010-09-014-0/+1623
| | | | |
| | | * | export ncr_key_clear(). And disallow key derivation from wrapping keys.Nikos Mavrogiannopoulos2010-08-311-0/+2
| | | | |
| | | * | Prevent usage of wrapping keys for anything else except wrapping.Nikos Mavrogiannopoulos2010-08-311-0/+8
| | | | |
* | | | | Merge branch 'standalone-rename' into userspace-cryptoMiloslav Trmač2010-08-2726-2134/+2665
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore crypto/userspace/Makefile crypto/userspace/cryptodev_int.h crypto/userspace/ncr-key-wrap.c crypto/userspace/ncr-key.c crypto/userspace/ncr-pk.c crypto/userspace/ncr-sessions.c crypto/userspace/ncr.c include/linux/cryptodev.h
| * | | | Merge branch 'standalone-master' into standalone-renameMiloslav Trmač2010-08-2726-2148/+2666
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: TODO crypto.4 examples/Makefile examples/ncr.c examples/pk.c examples/speed.c include/linux/cryptodev.h userspace/setkey.c
| | * | | Merge remote branch 'standalone/master' into standalone-masterMiloslav Trmač2010-08-2737-3646/+5066
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptodev_main.c ncr-int.h ncr.c
| | | * | Merge branch 'pk-transparent-hash'Miloslav Trmač2010-08-275-14/+318
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ncr-int.h
| | | | * | Add transparent hash signature examplesMiloslav Trmač2010-08-271-0/+245
| | | | | |
| | | | * | Allow sharing keys for "regular" and "transparent" algorithmsMiloslav Trmač2010-08-271-1/+3
| | | | | |
| | | | * | Implement PK signatures with transparent hashesMiloslav Trmač2010-08-273-13/+70
| | | | | |
| | | * | | Merge branch 'session_update-iv'Miloslav Trmač2010-08-272-0/+23
| | | |\ \ \
| | | | * | | Add support for changing IVs in sessionsMiloslav Trmač2010-08-272-0/+23
| | | | |/ /
| | | * | | Merge remote branch 'origin/newapi'Miloslav Trmač2010-08-277-61/+194
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/ncr.c examples/pk.c ncr-key-wrap.c ncr-key.c ncr.h
| | | | * | | Unwrapping keys are restricted the same way as wrapping keys.Nikos Mavrogiannopoulos2010-08-262-3/+3
| | | | | | |
| | | | * | | enforce the key wrap version.Nikos Mavrogiannopoulos2010-08-251-2/+10
| | | | | | |
| | | | * | | Added ENCRYPT, UNWRAPPING and VERIFY key flagsNikos Mavrogiannopoulos2010-08-255-6/+10
| | | | | | |
| | | | * | | The RFC5649 wrapping algorithm now includes a DER encoding of the data to ↵Nikos Mavrogiannopoulos2010-08-253-27/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | distinguish between keys of different types. This prevents keys being unwrapped in a wrong type.
| | | | * | | use the rfc3394 suffix.Nikos Mavrogiannopoulos2010-08-251-2/+2
| | | | | | |
| | | * | | | Merge branch 'bugfixes'Miloslav Trmač2010-08-252-4/+4
| | | |\ \ \ \
| | | | * | | | Make some objects staticMiloslav Trmač2010-08-252-4/+4
| | | | | | | |
| | | * | | | | Merge branch 'clone-session'Miloslav Trmač2010-08-257-15/+357
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptodev_int.h ncr-sessions.c
| | | | * | | | | Add hash cloning example.Miloslav Trmač2010-08-251-0/+218
| | | | | | | | |