diff options
| author | Damien Miller <djm@mindrot.org> | 2019-01-21 11:44:19 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-21 11:45:16 +1100 |
| commit | 5de6ac2bad11175135d9b819b3546db0ca0b4878 (patch) | |
| tree | 2b61768b04a2db62bee370127892c86ebd20d03d /ssh-pkcs11.c | |
| parent | e2cb445d786f7572da2af93e3433308eaed1093a (diff) | |
| download | openssh-git-5de6ac2bad11175135d9b819b3546db0ca0b4878.tar.gz | |
remove HAVE_DLOPEN that snuck in
portable doesn't use this
Diffstat (limited to 'ssh-pkcs11.c')
| -rw-r--r-- | ssh-pkcs11.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index 2b65010c..41992ceb 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c @@ -78,7 +78,6 @@ struct pkcs11_key { int pkcs11_interactive = 0; -#ifdef HAVE_DLOPEN static void ossl_error(const char *msg) { @@ -88,7 +87,6 @@ ossl_error(const char *msg) error("%s: %s: %.100s", __func__, msg, ERR_error_string(e, NULL)); } -#endif int pkcs11_init(int interactive) @@ -1675,7 +1673,7 @@ out: return (k); } #endif /* WITH_PKCS11_KEYGEN */ -#else /* HAVE_DLOPEN */ +#else /* ENABLE_PKCS11 */ int pkcs11_init(int interactive) { @@ -1695,4 +1693,4 @@ pkcs11_terminate(void) { error("%s: dlopen() not supported", __func__); } -#endif /* HAVE_DLOPEN */ +#endif /* ENABLE_PKCS11 */ |