2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00

[master] merge libiscpk11 to libisc

3735.	[cleanup]	Merged the libiscpk11 library into libisc
			to simplify dependencies. [RT #35205]
This commit is contained in:
Evan Hunt
2014-02-11 21:20:28 -08:00
parent 6b66ee9147
commit dbb012765c
154 changed files with 1109 additions and 2355 deletions

View File

@@ -57,7 +57,7 @@
#include <isc/result.h>
#include <isc/types.h>
#include <iscpk11/pk11.h>
#include <pk11/pk11.h>
#if !(defined(HAVE_GETPASSPHRASE) || (defined (__SVR4) && defined (__sun)))
#define getpassphrase(x) getpass(x)
@@ -106,7 +106,7 @@ main(int argc, char *argv[]) {
{ CKA_LABEL, (CK_BYTE_PTR) label, (CK_ULONG) sizeof(label) },
{ CKA_VALUE, buf, (CK_ULONG) sizeof(buf) }
};
iscpk11_context_t pctx;
pk11_context_t pctx;
char *lib_name = NULL;
char *pin = NULL;
int error = 0;