summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-08-21 02:42:58 +1000
committerDamien Miller <djm@mindrot.org>2013-08-21 02:42:58 +1000
commitd234afb0b3a8de1be78cbeafed5fc86912594c3c (patch)
tree66e9c912e3ba5c5e7eaead403a59813bb171299f
parente0ee727b8281a7c2ae20630ce83f6b200b404059 (diff)
- djm@cvs.openbsd.org 2013/08/13 18:32:08
[ssh-keygen.c] typo in error message; from Stephan Rickauer
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c8b45a31..2945ee799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
40 [sftp.c] 40 [sftp.c]
41 enable ctrl-left-arrow and ctrl-right-arrow to move forward/back a word; 41 enable ctrl-left-arrow and ctrl-right-arrow to move forward/back a word;
42 matching ksh's relatively recent change. 42 matching ksh's relatively recent change.
43 - djm@cvs.openbsd.org 2013/08/13 18:32:08
44 [ssh-keygen.c]
45 typo in error message; from Stephan Rickauer
43 46
4420130808 4720130808
45 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt 48 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 03c444d42..6ba64b73e 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.230 2013/07/20 01:44:37 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.231 2013/08/13 18:32:08 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1963,7 +1963,7 @@ update_krl_from_file(struct passwd *pw, const char *file, const Key *ca,
1963 continue; 1963 continue;
1964 if (strncasecmp(cp, "serial:", 7) == 0) { 1964 if (strncasecmp(cp, "serial:", 7) == 0) {
1965 if (ca == NULL) { 1965 if (ca == NULL) {
1966 fatal("revoking certificated by serial number " 1966 fatal("revoking certificates by serial number "
1967 "requires specification of a CA key"); 1967 "requires specification of a CA key");
1968 } 1968 }
1969 cp += 7; 1969 cp += 7;