Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement AUDIT_CRYPTO_KEY_VALUEncr-audit | Miloslav Trmač | 2010-09-07 | 3 | -0/+77 |
| | |||||
* | Implement AUDIT_CRYPTO_USERSPACE_OP | Miloslav Trmač | 2010-09-07 | 5 | -4/+163 |
| | |||||
* | Drop unnecessary checks for NULL | Miloslav Trmač | 2010-09-06 | 1 | -6/+3 |
| | |||||
* | Drop unnecessary checks for NULL | Miloslav Trmač | 2010-09-06 | 1 | -4/+2 |
| | |||||
* | Use the "ncr_lists *" type in cryptodev_main.c | Miloslav Trmač | 2010-09-06 | 3 | -4/+4 |
| | |||||
* | Implement AUDIT_CRYPTO_STORAGE_KEY | Miloslav Trmač | 2010-09-06 | 1 | -4/+24 |
| | |||||
* | Assign integer IDs to ncr.h contexts | Miloslav Trmač | 2010-09-06 | 2 | -0/+24 |
| | |||||
* | Merge branch 'standalone-rename' into userspace-cryptoncr-userspace-crypto | Miloslav Trmač | 2010-09-06 | 28 | -1209/+309 |
|\ | |||||
| * | Merge branch 'standalone-master' into standalone-renamencr-standalone-rename | Miloslav Trmač | 2010-09-06 | 30 | -1209/+705 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-27 | 23 | -1773/+2485 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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-rename | Miloslav Trmač | 2010-08-27 | 21 | -1783/+2090 |
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: TODO crypto.4 examples/Makefile examples/ncr.c examples/pk.c examples/speed.c include/linux/cryptodev.h userspace/setkey.c | ||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-23 | 30 | -28/+24 |
|\| | |||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-08-23 | 30 | -28/+24 |
| | | |||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-20 | 4 | -6/+4 |
|\| | |||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-08-20 | 4 | -6/+4 |
| | | |||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-08 | 10 | -31/+24 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crypto/userspace/cryptodev_main.c crypto/userspace/ncr-dh.c crypto/userspace/ncr-key-storage.c 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 include/linux/ncr.h | ||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-08-08 | 10 | -23/+24 |
| | | | | | | | | | | | | | | | | | | Conflicts: examples/cipher.c examples/hmac.c examples/ncr.c examples/pk.c userspace/setkey.c | ||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-05 | 34 | -4/+38 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: crypto/userspace/ncr-dh.c crypto/userspace/ncr-key-storage.c crypto/userspace/ncr-key-wrap.c crypto/userspace/ncr-key.c crypto/userspace/ncr-limits.c crypto/userspace/ncr-pk.c | ||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-08-05 | 34 | -4/+38 |
| | | |||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-04 | 3 | -99/+29 |
|\| | |||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-08-04 | 3 | -99/+29 |
| | | |||||
* | | Explicitly add crypto/userspace to #include path | Miloslav Trmač | 2010-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This is necessary for in-tree builds, where this path is not added by default. The alternative of using #include "..." is inconvenient for libtomcrypt headers nested several subdirectories deep that need to refer to ncr-int.h. | ||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-08-02 | 1 | -1/+2 |
|\| | |||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-08-02 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-07-31 | 7 | -303/+328 |
|\| | | | | | | | | | | | Conflicts: crypto/userspace/ncr-int.h crypto/userspace/ncr-limits.c | ||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-07-31 | 7 | -303/+328 |
| | | |||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-07-31 | 8 | -112/+144 |
|\| | |||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-07-31 | 8 | -112/+144 |
| | | | | | | | | | | | | | | | | Conflicts: AUTHORS README TODO userspace/setkey.c | ||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-07-27 | 15 | -182/+718 |
|\| | | | | | | | | | Conflicts: crypto/userspace/Makefile | ||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-07-27 | 15 | -182/+718 |
| | | | | | | | | | | | | Conflicts: COPYING examples/pk.c | ||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-07-26 | 31 | -1132/+1166 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crypto/userspace/Makefile crypto/userspace/ncr-data.c crypto/userspace/ncr-key-storage.c crypto/userspace/ncr-key-wrap.c crypto/userspace/ncr-key.c crypto/userspace/ncr-limits.c crypto/userspace/ncr-pk.c crypto/userspace/ncr-sessions.c crypto/userspace/ncr.c | ||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-07-26 | 31 | -1138/+1172 |
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crypto/userspace/ncr-data.c crypto/userspace/ncr_int.h examples/Makefile examples/ncr.c examples/pk.c examples/speed.c ncr-int.h ncr_int.h | ||||
* | | Merge branch 'standalone-rename' into userspace-crypto | Miloslav Trmač | 2010-07-23 | 11 | -876/+188 |
|\| | | | | | | | | | Conflicts: .gitignore | ||||
| * | Merge branch 'standalone-master' into standalone-rename | Miloslav Trmač | 2010-07-23 | 11 | -876/+188 |
| | | | | | | | | | | | | | | | | Conflicts: examples/Makefile examples/ncr.c examples/pk.c examples/speed.c | ||||
* | | Integrate cryptodev into kconfig and kbuild | Miloslav Trmač | 2010-07-22 | 1 | -40/+3 |
| | | |||||
* | | Update for public headers moved to include/linux | Miloslav Trmač | 2010-07-22 | 12 | -20/+20 |
| | | |||||
* | | Drop separate "version.h" | Miloslav Trmač | 2010-07-22 | 2 | -6/+1 |
|/ | |||||
* | Rename/delete files to fit into the kernel. | Miloslav Trmač | 2010-07-22 | 224 | -0/+26959 |
No files are modified in this commit - this is a "bridge" for allowing merges between standalone and integrated work. |