diff options
| author | Damien Miller <djm@mindrot.org> | 2010-11-05 10:19:49 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-11-05 10:19:49 +1100 |
| commit | b472a90d4ceca15620aa525099bf4b2d5ba8a59b (patch) | |
| tree | f4b9c97b1c3d78f68da5159852b7593a280edcf5 /key.h | |
| parent | 3a0e9f6479d50a95b5ccd7d7668b0ff45571de9c (diff) | |
- djm@cvs.openbsd.org 2010/10/28 11:22:09
[authfile.c key.c key.h ssh-keygen.c]
fix a possible NULL deref on loading a corrupt ECDH key
store ECDH group information in private keys files as "named groups"
rather than as a set of explicit group parameters (by setting
the OPENSSL_EC_NAMED_CURVE flag). This makes for shorter key files and
retrieves the group's OpenSSL NID that we need for various things.
Diffstat (limited to 'key.h')
| -rw-r--r-- | key.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: key.h,v 1.32 2010/09/09 10:45:45 djm Exp $ */ +/* $OpenBSD: key.h,v 1.33 2010/10/28 11:22:09 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -121,7 +121,7 @@ const char * key_curve_nid_to_name(int); u_int key_curve_nid_to_bits(int); int key_ecdsa_bits_to_nid(int); #ifdef OPENSSL_HAS_ECC -int key_ecdsa_group_to_nid(const EC_GROUP *); +int key_ecdsa_key_to_nid(EC_KEY *); const EVP_MD * key_ec_nid_to_evpmd(int nid); int key_ec_validate_public(const EC_GROUP *, const EC_POINT *); int key_ec_validate_private(const EC_KEY *); |