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 @@ | |||
1 | 20110904 | 1 | 20110904 |
2 | - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal | 2 | - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal |
3 | regress errors for the sandbox to warnings. ok tim dtucker | 3 | regress errors for the sandbox to warnings. ok tim dtucker |
4 | - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations | ||
5 | ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support. | ||
4 | 6 | ||
5 | 20110829 | 7 | 20110829 |
6 | - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting | 8 | - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 49e4eee10..4b6218b10 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -49,10 +49,7 @@ | |||
49 | #include "hostfile.h" | 49 | #include "hostfile.h" |
50 | #include "dns.h" | 50 | #include "dns.h" |
51 | #include "ssh2.h" | 51 | #include "ssh2.h" |
52 | |||
53 | #ifdef ENABLE_PKCS11 | ||
54 | #include "ssh-pkcs11.h" | 52 | #include "ssh-pkcs11.h" |
55 | #endif | ||
56 | 53 | ||
57 | /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ | 54 | /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ |
58 | #define DEFAULT_BITS 2048 | 55 | #define DEFAULT_BITS 2048 |
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index 286c232c7..1f4c1c8e4 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c | |||
@@ -590,4 +590,18 @@ fail: | |||
590 | return (-1); | 590 | return (-1); |
591 | } | 591 | } |
592 | 592 | ||
593 | #else | ||
594 | |||
595 | int | ||
596 | pkcs11_init(int interactive) | ||
597 | { | ||
598 | return (0); | ||
599 | } | ||
600 | |||
601 | void | ||
602 | pkcs11_terminate(void) | ||
603 | { | ||
604 | return; | ||
605 | } | ||
606 | |||
593 | #endif /* ENABLE_PKCS11 */ | 607 | #endif /* ENABLE_PKCS11 */ |