summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-29 17:48:55 +1100
committerDamien Miller <djm@mindrot.org>2013-12-29 17:48:55 +1100
commit5baeacf8a80f054af40731c6f92435f9164b8e02 (patch)
treea4102182294007c675f3e1ba3f12b25b6742cd4c
parent83f2fe26cb19330712c952eddbd3c0b621674adc (diff)
- djm@cvs.openbsd.org 2013/12/29 02:37:04
[key.c] correct comment for key_to_certified()
-rw-r--r--ChangeLog3
-rw-r--r--key.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a541c8ee..8aef749a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
46 - djm@cvs.openbsd.org 2013/12/29 02:28:10 46 - djm@cvs.openbsd.org 2013/12/29 02:28:10
47 [key.c] 47 [key.c]
48 allow ed25519 keys to appear as certificate authorities 48 allow ed25519 keys to appear as certificate authorities
49 - djm@cvs.openbsd.org 2013/12/29 02:37:04
50 [key.c]
51 correct comment for key_to_certified()
49 52
5020131221 5320131221
51 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. 54 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
diff --git a/key.c b/key.c
index ec40cb152..10a48fa68 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.111 2013/12/29 02:28:10 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.112 2013/12/29 02:37:04 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
@@ -1914,7 +1914,7 @@ key_type_plain(int type)
1914 } 1914 }
1915} 1915}
1916 1916
1917/* Convert a KEY_RSA or KEY_DSA to their _CERT equivalent */ 1917/* Convert a plain key to their _CERT equivalent */
1918int 1918int
1919key_to_certified(Key *k, int legacy) 1919key_to_certified(Key *k, int legacy)
1920{ 1920{