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

- (dtucker) [key.c sshkey.c] Put new ecdsa bits inside ifdef OPENSSL_HAS_ECC.

Browse Source
This commit is contained in:
Darren Tucker 2014-07-19 07:23:55 +10:00
parent f0fe9ea1be
commit d1a0421f8e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -41,6 +41,7 @@
in servconf.h. in servconf.h.
- (dtucker) [Makefile.in] Add a t-exec target to run just the executable - (dtucker) [Makefile.in] Add a t-exec target to run just the executable
tests. tests.
- (dtucker) [key.c sshkey.c] Put new ecdsa bits inside ifdef OPENSSL_HAS_ECC.
20140717 20140717
- (djm) [digest-openssl.c] Preserve array order when disabling digests. - (djm) [digest-openssl.c] Preserve array order when disabling digests.

2
key.c
View File

@ -255,7 +255,7 @@ key_cert_check_authority(const Key *k, int want_host, int require_principal,
return 0; return 0;
} }
#ifdef WITH_OPENSSL #if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
int int
key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public) key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public)
{ {

2
sshkey.c
View File

@ -762,6 +762,7 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain)
(ret = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0) (ret = sshbuf_put_bignum2(b, key->dsa->pub_key)) != 0)
return ret; return ret;
break; break;
# ifdef OPENSSL_HAS_ECC
case KEY_ECDSA: case KEY_ECDSA:
if (key->ecdsa == NULL) if (key->ecdsa == NULL)
return SSH_ERR_INVALID_ARGUMENT; return SSH_ERR_INVALID_ARGUMENT;
@ -771,6 +772,7 @@ to_blob_buf(const struct sshkey *key, struct sshbuf *b, int force_plain)
(ret = sshbuf_put_eckey(b, key->ecdsa)) != 0) (ret = sshbuf_put_eckey(b, key->ecdsa)) != 0)
return ret; return ret;
break; break;
# endif
case KEY_RSA: case KEY_RSA:
if (key->rsa == NULL) if (key->rsa == NULL)
return SSH_ERR_INVALID_ARGUMENT; return SSH_ERR_INVALID_ARGUMENT;