diff options
author | Damien Miller <djm@mindrot.org> | 2014-02-04 11:18:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-02-04 11:18:20 +1100 |
commit | 1d2c4564265ee827147af246a16f3777741411ed (patch) | |
tree | af83ab151453d013118cd1bd20fb8ba887665fed /ssh-keygen.c | |
parent | 3928de067c286683a95fbdbdb5fdb3c78a0e5efd (diff) |
- tedu@cvs.openbsd.org 2014/01/31 16:39:19
[auth2-chall.c authfd.c authfile.c bufaux.c bufec.c canohost.c]
[channels.c cipher-chachapoly.c clientloop.c configure.ac hostfile.c]
[kexc25519.c krl.c monitor.c sandbox-systrace.c session.c]
[sftp-client.c ssh-keygen.c ssh.c sshconnect2.c sshd.c sshlogin.c]
[openbsd-compat/explicit_bzero.c openbsd-compat/openbsd-compat.h]
replace most bzero with explicit_bzero, except a few that cna be memset
ok djm dtucker
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index eae83a461..8140447f7 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.238 2013/12/06 13:39:49 markus Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.239 2014/01/31 16:39:19 tedu 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 |
@@ -1716,7 +1716,7 @@ parse_absolute_time(const char *s) | |||
1716 | fatal("Invalid certificate time format %s", s); | 1716 | fatal("Invalid certificate time format %s", s); |
1717 | } | 1717 | } |
1718 | 1718 | ||
1719 | bzero(&tm, sizeof(tm)); | 1719 | memset(&tm, 0, sizeof(tm)); |
1720 | if (strptime(buf, fmt, &tm) == NULL) | 1720 | if (strptime(buf, fmt, &tm) == NULL) |
1721 | fatal("Invalid certificate time %s", s); | 1721 | fatal("Invalid certificate time %s", s); |
1722 | if ((tt = mktime(&tm)) < 0) | 1722 | if ((tt = mktime(&tm)) < 0) |