summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--key.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 481e9c310..6a0cf4932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
1520110515 1920110515
16 - (djm) OpenBSD CVS Sync 20 - (djm) OpenBSD CVS Sync
diff --git a/key.c b/key.c
index e3a305e66..498cf5a60 100644
--- a/key.c
+++ b/key.c
@@ -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;