tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 14:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix building w/out ECC.

Browse Source 
Ifdef out ECC specific code so that that it'll build against an OpenSSL
configured w/out ECC.  With & ok djm@
This commit is contained in:
Darren Tucker 2019-05-17 10:54:51 +10:00
parent 633703babf
commit 97370f6c2c
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kexecdh.c
View File

@ -208,4 +208,30 @@ kex_ecdh_dec(struct kex *kex, const struct sshbuf *server_blob,
kex->ec_client_key = NULL; kex->ec_client_key = NULL;
return r; return r;
} }
#else
#include "sshkey.h"
#include "kex.h"
#include "ssherr.h"
int
kex_ecdh_keypair(struct kex *kex)
{
return SSH_ERR_SIGN_ALG_UNSUPPORTED;
}
int
kex_ecdh_enc(struct kex *kex, const struct sshbuf *client_blob,
struct sshbuf **server_blobp, struct sshbuf **shared_secretp)
{
return SSH_ERR_SIGN_ALG_UNSUPPORTED;
}
int
kex_ecdh_dec(struct kex *kex, const struct sshbuf *server_blob,
struct sshbuf **shared_secretp)
{
return SSH_ERR_SIGN_ALG_UNSUPPORTED;
}
#endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */ #endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */

2
ssh-pkcs11-helper.c
View File

@ -206,6 +206,7 @@ process_sign(void)
slen = ret; slen = ret;
ok = 0; ok = 0;
} }
#ifdef OPENSSL_HAS_ECC
} else if (key->type == KEY_ECDSA) { } else if (key->type == KEY_ECDSA) {
u_int xslen = ECDSA_size(key->ecdsa); u_int xslen = ECDSA_size(key->ecdsa);
@ -219,6 +220,7 @@ process_sign(void)
error("%s: ECDSA_sign" error("%s: ECDSA_sign"
" returns %d", __func__, ret); " returns %d", __func__, ret);
slen = xslen; slen = xslen;
#endif /* OPENSSL_HAS_ECC */
} else } else
error("%s: don't know how to sign with key " error("%s: don't know how to sign with key "
"type %d", __func__, (int)key->type); "type %d", __func__, (int)key->type);

4
ssh-pkcs11.c
View File

@ -916,7 +916,9 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx,
X509 *x509 = NULL; X509 *x509 = NULL;
EVP_PKEY *evp; EVP_PKEY *evp;
RSA *rsa = NULL; RSA *rsa = NULL;
#ifdef OPENSSL_HAS_ECC
EC_KEY *ec = NULL; EC_KEY *ec = NULL;
#endif
struct sshkey *key = NULL; struct sshkey *key = NULL;
int i; int i;
#ifdef HAVE_EC_KEY_METHOD_NEW #ifdef HAVE_EC_KEY_METHOD_NEW
@ -1043,7 +1045,9 @@ fail:
free(cert_attr[i].pValue); free(cert_attr[i].pValue);
X509_free(x509); X509_free(x509);
RSA_free(rsa); RSA_free(rsa);
#ifdef OPENSSL_HAS_ECC
EC_KEY_free(ec); EC_KEY_free(ec);
#endif
return (key); return (key);
} }