summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 15:08:28 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 15:08:28 +0100
commitc41345ad7ee5a22689e2c009595e85fa27b4b39a (patch)
tree55ee4e68932acc86eeec1594063783252680e640 /ssh-keygen.c
parent4425e64da7dee0b3e81f1ae301f56fa3a83fe221 (diff)
parent79524838f0d5eb1cdf9fc268ec4c0bce46ccb67f (diff)
Import 6.3p1 tarball
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6ee8145af..03c444d42 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.232 2013/08/13 18:33:08 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.230 2013/07/20 01:44:37 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 certificates by serial number " 1966 fatal("revoking certificated 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;
@@ -2000,7 +2000,7 @@ update_krl_from_file(struct passwd *pw, const char *file, const Key *ca,
2000 } 2000 }
2001 } else if (strncasecmp(cp, "id:", 3) == 0) { 2001 } else if (strncasecmp(cp, "id:", 3) == 0) {
2002 if (ca == NULL) { 2002 if (ca == NULL) {
2003 fatal("revoking certificates by key ID " 2003 fatal("revoking certificated by key ID "
2004 "requires specification of a CA key"); 2004 "requires specification of a CA key");
2005 } 2005 }
2006 cp += 3; 2006 cp += 3;