diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2014-06-25 23:37:44 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2014-06-25 23:37:44 +0800 |
| commit | 6b5317e7cc448ace03e21575e852ef5c634d3c09 (patch) | |
| tree | 8bc0164e081f4b0ef67b193fdbedd3a48dfd27c3 | |
| parent | 2a1d28ea3a0a164593c7819ec1c2489224ed68d5 (diff) | |
Fix compiling with ECDSA and DSS disabled
| -rw-r--r-- | keyimport.c | 16 | ||||
| -rw-r--r-- | signkey.c | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/keyimport.c b/keyimport.c index 3da14ad..66a7f55 100644 --- a/keyimport.c +++ b/keyimport.c @@ -602,13 +602,18 @@ static sign_key *openssh_read(const char *filename, char * UNUSED(passphrase)) */ blobbuf = buf_new(3000); +#ifdef DROPBEAR_DSS if (key->type == OSSH_DSA) { buf_putstring(blobbuf, "ssh-dss", 7); retkey->type = DROPBEAR_SIGNKEY_DSS; - } else if (key->type == OSSH_RSA) { + } +#endif +#ifdef DROPBEAR_RSA + if (key->type == OSSH_RSA) { buf_putstring(blobbuf, "ssh-rsa", 7); retkey->type = DROPBEAR_SIGNKEY_RSA; } +#endif for (i = 0; i < num_integers; i++) { ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p, @@ -831,7 +836,14 @@ static int openssh_write(const char *filename, sign_key *key, mp_int dmp1, dmq1, iqmp, tmpval; /* for rsa */ #endif - if (key->type == DROPBEAR_SIGNKEY_RSA || key->type == DROPBEAR_SIGNKEY_DSS) + if ( +#ifdef DROPBEAR_RSA + key->type == DROPBEAR_SIGNKEY_RSA || +#endif +#ifdef DROPBEAR_DSS + key->type == DROPBEAR_SIGNKEY_DSS || +#endif + 0) { /* * Fetch the key blobs. @@ -106,6 +106,7 @@ enum signkey_type signkey_type_from_name(const char* name, unsigned int namelen) void ** signkey_key_ptr(sign_key *key, enum signkey_type type) { switch (type) { +#ifdef DROPBEAR_ECDSA #ifdef DROPBEAR_ECC_256 case DROPBEAR_SIGNKEY_ECDSA_NISTP256: return (void**)&key->ecckey256; @@ -118,6 +119,7 @@ signkey_key_ptr(sign_key *key, enum signkey_type type) { case DROPBEAR_SIGNKEY_ECDSA_NISTP521: return (void**)&key->ecckey521; #endif +#endif /* DROPBEAR_ECDSA */ #ifdef DROPBEAR_RSA case DROPBEAR_SIGNKEY_RSA: return (void**)&key->rsakey; |