summaryrefslogtreecommitdiff
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2019-01-21 11:44:19 +1100
committerDamien Miller <djm@mindrot.org>2019-01-21 11:45:16 +1100
commit5de6ac2bad11175135d9b819b3546db0ca0b4878 (patch)
tree2b61768b04a2db62bee370127892c86ebd20d03d /ssh-pkcs11.c
parente2cb445d786f7572da2af93e3433308eaed1093a (diff)
remove HAVE_DLOPEN that snuck in
portable doesn't use this
Diffstat (limited to 'ssh-pkcs11.c')
-rw-r--r--ssh-pkcs11.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 2b65010ce..41992ceb7 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -78,7 +78,6 @@ struct pkcs11_key {
78 78
79int pkcs11_interactive = 0; 79int pkcs11_interactive = 0;
80 80
81#ifdef HAVE_DLOPEN
82static void 81static void
83ossl_error(const char *msg) 82ossl_error(const char *msg)
84{ 83{
@@ -88,7 +87,6 @@ ossl_error(const char *msg)
88 error("%s: %s: %.100s", __func__, msg, 87 error("%s: %s: %.100s", __func__, msg,
89 ERR_error_string(e, NULL)); 88 ERR_error_string(e, NULL));
90} 89}
91#endif
92 90
93int 91int
94pkcs11_init(int interactive) 92pkcs11_init(int interactive)
@@ -1675,7 +1673,7 @@ out:
1675 return (k); 1673 return (k);
1676} 1674}
1677#endif /* WITH_PKCS11_KEYGEN */ 1675#endif /* WITH_PKCS11_KEYGEN */
1678#else /* HAVE_DLOPEN */ 1676#else /* ENABLE_PKCS11 */
1679int 1677int
1680pkcs11_init(int interactive) 1678pkcs11_init(int interactive)
1681{ 1679{
@@ -1695,4 +1693,4 @@ pkcs11_terminate(void)
1695{ 1693{
1696 error("%s: dlopen() not supported", __func__); 1694 error("%s: dlopen() not supported", __func__);
1697} 1695}
1698#endif /* HAVE_DLOPEN */ 1696#endif /* ENABLE_PKCS11 */