summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-12 10:55:16 +1100
committerDamien Miller <djm@mindrot.org>2013-02-12 10:55:16 +1100
commit377d9a44f9c79c4fde96e973392175d5b22eed80 (patch)
treed377091052766cd288689fbe10e9dc38c8863c30
parent6045f5d5748582dff473934d760cf0e7e892da8b (diff)
- krw@cvs.openbsd.org 2013/01/25 05:00:27
[krl.c] Revert last. Breaks due to likely typo. Let djm@ fix later. ok djm@ via dlg@
-rw-r--r--ChangeLog4
-rw-r--r--krl.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87fe12d71..4f8fe9713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
6 - djm@cvs.openbsd.org 2013/01/24 22:08:56 6 - djm@cvs.openbsd.org 2013/01/24 22:08:56
7 [krl.c] 7 [krl.c]
8 skip serial lookup when cert's serial number is zero 8 skip serial lookup when cert's serial number is zero
9 - krw@cvs.openbsd.org 2013/01/25 05:00:27
10 [krl.c]
11 Revert last. Breaks due to likely typo. Let djm@ fix later.
12 ok djm@ via dlg@
9 13
1020130211 1420130211
11 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old 15 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
diff --git a/krl.c b/krl.c
index 916852675..6d86c2097 100644
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17/* $OpenBSD: krl.c,v 1.6 2013/01/24 22:08:56 djm Exp $ */ 17/* $OpenBSD: krl.c,v 1.7 2013/01/25 05:00:27 krw Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20
@@ -1149,7 +1149,7 @@ is_key_revoked(struct ssh_krl *krl, const Key *key)
1149 } 1149 }
1150 1150
1151 /* Legacy cert formats lack serial numbers */ 1151 /* Legacy cert formats lack serial numbers */
1152 if (key_cert_is_legacy(key) || key->cert->serial == buf0) 1152 if (key_cert_is_legacy(key))
1153 return 0; 1153 return 0;
1154 1154
1155 bzero(&rs, sizeof(rs)); 1155 bzero(&rs, sizeof(rs));