[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/sha2.c
+++ b/lib/isc/sha2.c
@@ -64,8 +64,8 @@
 #include <isc/util.h>

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

 #ifdef ISC_PLATFORM_OPENSSLHASH