diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2011-09-04 19:59:26 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2011-09-04 19:59:26 +1000 |
| commit | 0dd24e02ec85146660302a7bcc491a0515b983ae (patch) | |
| tree | bf27677f3f6f3a0db0327a0c5022643a3df8cd17 | |
| parent | 6efd94f32e7ddf3cfdb94f0a3f91310304f8f6b5 (diff) | |
- (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations
ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ssh-keygen.c | 3 | ||||
| -rw-r--r-- | ssh-pkcs11.c | 14 |
3 files changed, 16 insertions, 3 deletions
@@ -1,6 +1,8 @@ 20110904 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal regress errors for the sandbox to warnings. ok tim dtucker + - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations + ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support. 20110829 - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting diff --git a/ssh-keygen.c b/ssh-keygen.c index 49e4eee1..4b6218b1 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -49,10 +49,7 @@ #include "hostfile.h" #include "dns.h" #include "ssh2.h" - -#ifdef ENABLE_PKCS11 #include "ssh-pkcs11.h" -#endif /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ #define DEFAULT_BITS 2048 diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index 286c232c..1f4c1c8e 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c @@ -590,4 +590,18 @@ fail: return (-1); } +#else + +int +pkcs11_init(int interactive) +{ + return (0); +} + +void +pkcs11_terminate(void) +{ + return; +} + #endif /* ENABLE_PKCS11 */ |