diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-09-10 12:28:24 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-09-10 12:28:24 +1000 |
commit | 8ccb7392e7ea45d2997afdfa981a450c7db85211 (patch) | |
tree | 5dd0769c5ec6a54fffb0e77a670bdc4e84046a6c /key.c | |
parent | 6af914a15c0c33e8b5bab5ca61919b8562ff1db9 (diff) |
- (dtucker) [kex.h key.c packet.h ssh-agent.c ssh.c] A few more ECC ifdefs
for missing headers and compiler warnings.
Diffstat (limited to 'key.c')
-rw-r--r-- | key.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -261,7 +261,9 @@ cert_compare(struct KeyCert *a, struct KeyCert *b) | |||
261 | int | 261 | int |
262 | key_equal_public(const Key *a, const Key *b) | 262 | key_equal_public(const Key *a, const Key *b) |
263 | { | 263 | { |
264 | #ifdef OPENSSL_HAS_ECC | ||
264 | BN_CTX *bnctx; | 265 | BN_CTX *bnctx; |
266 | #endif | ||
265 | 267 | ||
266 | if (a == NULL || b == NULL || | 268 | if (a == NULL || b == NULL || |
267 | key_type_plain(a->type) != key_type_plain(b->type)) | 269 | key_type_plain(a->type) != key_type_plain(b->type)) |
@@ -656,9 +658,12 @@ key_read(Key *ret, char **cpp) | |||
656 | Key *k; | 658 | Key *k; |
657 | int success = -1; | 659 | int success = -1; |
658 | char *cp, *space; | 660 | char *cp, *space; |
659 | int len, n, type, curve_nid = -1; | 661 | int len, n, type; |
660 | u_int bits; | 662 | u_int bits; |
661 | u_char *blob; | 663 | u_char *blob; |
664 | #ifdef OPENSSL_HAS_ECC | ||
665 | int curve_nid = -1; | ||
666 | #endif | ||
662 | 667 | ||
663 | cp = *cpp; | 668 | cp = *cpp; |
664 | 669 | ||
@@ -1437,11 +1442,12 @@ Key * | |||
1437 | key_from_blob(const u_char *blob, u_int blen) | 1442 | key_from_blob(const u_char *blob, u_int blen) |
1438 | { | 1443 | { |
1439 | Buffer b; | 1444 | Buffer b; |
1440 | int rlen, type, nid = -1; | 1445 | int rlen, type; |
1441 | char *ktype = NULL, *curve = NULL; | 1446 | char *ktype = NULL, *curve = NULL; |
1442 | Key *key = NULL; | 1447 | Key *key = NULL; |
1443 | #ifdef OPENSSL_HAS_ECC | 1448 | #ifdef OPENSSL_HAS_ECC |
1444 | EC_POINT *q = NULL; | 1449 | EC_POINT *q = NULL; |
1450 | int nid = -1; | ||
1445 | #endif | 1451 | #endif |
1446 | 1452 | ||
1447 | #ifdef DEBUG_PK | 1453 | #ifdef DEBUG_PK |