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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implement AUDIT_CRYPTO_USERSPACE_OP	Miloslav Trmač	2010-09-07	1	-0/+2
\|
*	Use the "ncr_lists *" type in cryptodev_main.c	Miloslav Trmač	2010-09-06	1	-1/+1
\|
*	Assign integer IDs to ncr.h contexts	Miloslav Trmač	2010-09-06	1	-0/+2
\|
*	Merge branch 'standalone-rename' into userspace-cryptoncr-userspace-crypto	Miloslav Trmač	2010-09-06	1	-7/+24
\|\
\| *	Merge branch 'standalone-master' into standalone-renamencr-standalone-rename	Miloslav Trmač	2010-09-06	1	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-50/+98
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-50/+98
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-20	1	-2/+1
\|\\|
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-20	1	-2/+1
\| \|
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-08-08	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-07-31	1	-32/+29
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/ncr-int.h crypto/userspace/ncr-limits.c
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	1	-32/+29
\| \|
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-31	1	-2/+1
\|\\|
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: AUTHORS README TODO userspace/setkey.c
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-27	1	-1/+8
\|\\| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/Makefile
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-27	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+170
	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