merge yet again

This commit is contained in:
Matt Johnston
2013-11-01 00:21:59 +08:00
8 changed files with 79 additions and 43 deletions

View File

@@ -763,7 +763,7 @@ static sign_key *openssh_read(const char *filename, char *passphrase)
goto error;
}
*signkey_ecc_key_ptr(retkey, retkey->type) = ecc;
*signkey_key_ptr(retkey, retkey->type) = ecc;
}
#endif // DROPBEAR_ECDSA