diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
| commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
| tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /ssh-pkcs11.c | |
| parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
| parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) | |
merge 5.9p1
Diffstat (limited to 'ssh-pkcs11.c')
| -rw-r--r-- | ssh-pkcs11.c | 14 |
1 files changed, 14 insertions, 0 deletions
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 */ |