RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix FIDO key support for !OPENSSL_HAS_ECC case 

ok dtucker
This commit is contained in:
Damien Miller 2021-10-01 16:35:05 +10:00
parent 489741dc68
commit 872595572b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sk-usbhid.c
View File

@ -31,6 +31,15 @@
#include <sha2.h> #include <sha2.h>
#endif #endif
/*
* Almost every use of OpenSSL in this file is for ECDSA-NISTP256.
* This is strictly a larger hammer than necessary, but it reduces changes
* with upstream.
*/
#ifndef OPENSSL_HAS_ECC
# undef WITH_OPENSSL
#endif
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>

13
ssh-sk.c
View File

@ -29,10 +29,10 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifdef WITH_OPENSSL #if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
#include <openssl/objects.h> #include <openssl/objects.h>
#include <openssl/ec.h> #include <openssl/ec.h>
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
#include "log.h" #include "log.h"
#include "misc.h" #include "misc.h"
@ -45,6 +45,15 @@
#include "sk-api.h" #include "sk-api.h"
#include "crypto_api.h" #include "crypto_api.h"
/*
* Almost every use of OpenSSL in this file is for ECDSA-NISTP256.
* This is strictly a larger hammer than necessary, but it reduces changes
* with upstream.
*/
#ifndef OPENSSL_HAS_ECC
# undef WITH_OPENSSL
#endif
struct sshsk_provider { struct sshsk_provider {
char *path; char *path;
void *dlhandle; void *dlhandle;