kernel-crypto.git - User-space crypto API development for Linux

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'standalone-rename' into userspace-cryptoncr-userspace-crypto	Miloslav Trmač	2010-09-06	1	-8/+6
\|\
\| *	Merge branch 'standalone-master' into standalone-renamencr-standalone-rename	Miloslav Trmač	2010-09-06	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: TODO crypto.4 examples/Makefile examples/ncr.c examples/pk.c examples/speed.c include/linux/cryptodev.h userspace/setkey.c
* \|	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-07-27	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/Makefile
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: COPYING examples/pk.c
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-26	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Integrate cryptodev into kconfig and kbuild	Miloslav Trmač	2010-07-22	1	-40/+3
\| \|
* \|	Drop separate "version.h"	Miloslav Trmač	2010-07-22	1	-4/+0
\|/
*	Rename/delete files to fit into the kernel.	Miloslav Trmač	2010-07-22	1	-0/+113
	No files are modified in this commit - this is a "bridge" for allowing merges between standalone and integrated work.