diff options
| author | Damien Miller <djm@mindrot.org> | 2010-09-10 11:39:26 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-09-10 11:39:26 +1000 |
| commit | 6af914a15c0c33e8b5bab5ca61919b8562ff1db9 (patch) | |
| tree | b87546d8a88a05e6fd600cbb2b8c0b132278cb10 /authfile.c | |
| parent | 041ab7c1e7d6514ed84a539a767f79ffb356e807 (diff) | |
| download | openssh-git-6af914a15c0c33e8b5bab5ca61919b8562ff1db9.tar.gz | |
- (djm) [authfd.c authfile.c bufec.c buffer.h configure.ac kex.h kexecdh.c]
[kexecdhc.c kexecdhs.c key.c key.h myproposal.h packet.c readconf.c]
[ssh-agent.c ssh-ecdsa.c ssh-keygen.c ssh.c] Disable ECDH and ECDSA on
platforms that don't have the requisite OpenSSL support. ok dtucker@
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -213,10 +213,12 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase, success = PEM_write_DSAPrivateKey(fp, key->dsa, cipher, passphrase, len, NULL, NULL); break; +#ifdef OPENSSL_HAS_ECC case KEY_ECDSA: success = PEM_write_ECPrivateKey(fp, key->ecdsa, cipher, passphrase, len, NULL, NULL); break; +#endif case KEY_RSA: success = PEM_write_RSAPrivateKey(fp, key->rsa, cipher, passphrase, len, NULL, NULL); @@ -515,6 +517,7 @@ key_load_private_pem(int fd, int type, const char *passphrase, #ifdef DEBUG_PK DSA_print_fp(stderr, prv->dsa, 8); #endif +#ifdef OPENSSL_HAS_ECC } else if (pk->type == EVP_PKEY_EC && (type == KEY_UNSPEC||type==KEY_ECDSA)) { prv = key_new(KEY_UNSPEC); @@ -538,6 +541,7 @@ key_load_private_pem(int fd, int type, const char *passphrase, if (prv->ecdsa != NULL) key_dump_ec_key(prv->ecdsa); #endif +#endif /* OPENSSL_HAS_ECC */ } else { error("PEM_read_PrivateKey: mismatch or " "unknown EVP_PKEY save_type %d", pk->save_type); |