[master] merge libiscpk11 to libisc

3735. [cleanup] Merged the libiscpk11 library into libisc to simplify dependencies. [RT #35205]
2014-02-11 21:20:28 -08:00
parent 6b66ee9147
commit dbb012765c
154 changed files with 1109 additions and 2355 deletions
--- a/lib/isc/entropy.c
+++ b/lib/isc/entropy.c
@@ -47,7 +47,7 @@
 #include <isc/util.h>

 #ifdef PKCS11CRYPTO
-#include <iscpk11/pk11.h>
+#include <pk11/pk11.h>
 #endif

 #define ENTROPY_MAGIC		ISC_MAGIC('E', 'n', 't', 'e')