diff options
| author | Damien Miller <djm@mindrot.org> | 2021-10-01 22:40:06 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-10-01 22:40:06 +1000 |
| commit | 16a25414f303cd6790eb967aeb962040e32c9c7a (patch) | |
| tree | f2a4095993a436dee288a04f5ec0f1e825e2f8ac | |
| parent | dee22129bbc61e25b1003adfa2bc584c5406ef2d (diff) | |
| download | openssh-git-16a25414f303cd6790eb967aeb962040e32c9c7a.tar.gz | |
make sk-dummy.so work without libcrypto installed
| -rw-r--r-- | regress/misc/sk-dummy/sk-dummy.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c index 4003362d..c107aebe 100644 --- a/regress/misc/sk-dummy/sk-dummy.c +++ b/regress/misc/sk-dummy/sk-dummy.c @@ -28,6 +28,11 @@ #include "crypto_api.h" #include "sk-api.h" +#if defined(WITH_OPENSSL) && !defined(WITH_OPENSSL) +# undef WITH_OPENSSL +#endif + +#ifdef WITH_OPENSSL #include <openssl/opensslv.h> #include <openssl/crypto.h> #include <openssl/evp.h> @@ -36,8 +41,6 @@ #include <openssl/ecdsa.h> #include <openssl/pem.h> -/* #define SK_DEBUG 1 */ - /* Compatibility with OpenSSH 1.0.x */ #if (OPENSSL_VERSION_NUMBER < 0x10100000L) #define ECDSA_SIG_get0(sig, pr, ps) \ @@ -46,6 +49,9 @@ (*ps) = sig->s; \ } while (0) #endif +#endif /* WITH_OPENSSL */ + +/* #define SK_DEBUG 1 */ #if SSH_SK_VERSION_MAJOR != 0x00070000 # error SK API has changed, sk-dummy.c needs an update |