Merged the FIPS140-2 support code.
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 30 Nov 2013 17:30:14 +0000 (18:30 +0100)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 30 Nov 2013 17:43:23 +0000 (18:43 +0100)
commitbdde81f6b1d8b4f12c887b440aad646a0e03c63b
treec6174f1753572e00b9784f8c1c42ece02e65402e
parent18ab6ffcb476062379ff46700edf0aaf56c7e240
parent720fdb1d0dea8c0876772b7f4227d07316fa321c
Merged the FIPS140-2 support code.

Conflicts:
lib/gnutls_global.c
tests/mini-overhead.c
configure.ac
lib/fips.c
lib/gnutls_global.c
tests/mini-overhead.c