diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-20 19:03:08 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-20 19:03:08 +1000 |
commit | 8f639fe722133495eebad594f2f9c886857a5ef8 (patch) | |
tree | 9fca96db3580779d2b026912d73c57e3454293dd | |
parent | 814ace08751a80c3b965c06fdfc1c9ac3d7698ca (diff) |
- djm@cvs.openbsd.org 2011/05/17 07:13:31
[key.c]
fatal() if asked to generate a legacy ECDSA cert (these don't exist)
and fix the regress test that was trying to generate them :)
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | key.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -11,6 +11,10 @@ | |||
11 | - djm@cvs.openbsd.org 2011/05/15 08:09:01 | 11 | - djm@cvs.openbsd.org 2011/05/15 08:09:01 |
12 | [authfd.c monitor.c serverloop.c] | 12 | [authfd.c monitor.c serverloop.c] |
13 | use FD_CLOEXEC consistently; patch from zion AT x96.org | 13 | use FD_CLOEXEC consistently; patch from zion AT x96.org |
14 | - djm@cvs.openbsd.org 2011/05/17 07:13:31 | ||
15 | [key.c] | ||
16 | fatal() if asked to generate a legacy ECDSA cert (these don't exist) | ||
17 | and fix the regress test that was trying to generate them :) | ||
14 | 18 | ||
15 | 20110515 | 19 | 20110515 |
16 | - (djm) OpenBSD CVS Sync | 20 | - (djm) OpenBSD CVS Sync |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.c,v 1.96 2011/02/04 00:44:21 djm Exp $ */ | 1 | /* $OpenBSD: key.c,v 1.97 2011/05/17 07:13:31 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * read_bignum(): | 3 | * read_bignum(): |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1817,6 +1817,9 @@ key_to_certified(Key *k, int legacy) | |||
1817 | k->type = legacy ? KEY_DSA_CERT_V00 : KEY_DSA_CERT; | 1817 | k->type = legacy ? KEY_DSA_CERT_V00 : KEY_DSA_CERT; |
1818 | return 0; | 1818 | return 0; |
1819 | case KEY_ECDSA: | 1819 | case KEY_ECDSA: |
1820 | if (legacy) | ||
1821 | fatal("%s: legacy ECDSA certificates are not supported", | ||
1822 | __func__); | ||
1820 | k->cert = cert_new(); | 1823 | k->cert = cert_new(); |
1821 | k->type = KEY_ECDSA_CERT; | 1824 | k->type = KEY_ECDSA_CERT; |
1822 | return 0; | 1825 | return 0; |