summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--key.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8aef749a3..bae45adce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
49 - djm@cvs.openbsd.org 2013/12/29 02:37:04 49 - djm@cvs.openbsd.org 2013/12/29 02:37:04
50 [key.c] 50 [key.c]
51 correct comment for key_to_certified() 51 correct comment for key_to_certified()
52 - djm@cvs.openbsd.org 2013/12/29 02:49:52
53 [key.c]
54 correct comment for key_drop_cert()
52 55
5320131221 5620131221
54 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. 57 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
diff --git a/key.c b/key.c
index 10a48fa68..1d20167ee 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.112 2013/12/29 02:37:04 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.113 2013/12/29 02:49:52 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
@@ -1947,7 +1947,7 @@ key_to_certified(Key *k, int legacy)
1947 } 1947 }
1948} 1948}
1949 1949
1950/* Convert a KEY_RSA_CERT or KEY_DSA_CERT to their raw key equivalent */ 1950/* Convert a certificate to its raw key equivalent */
1951int 1951int
1952key_drop_cert(Key *k) 1952key_drop_cert(Key *k)
1953{ 1953{