From c8908aabff252f5da772d4e679479c2b7d18cac1 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 7 Nov 2013 13:38:35 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2013/11/06 23:05:59 [ssh-pkcs11.c] from portable: s/true/true_val/ to avoid name collisions on dump platforms RCSID sync only --- ChangeLog | 4 ++++ ssh-pkcs11.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 020dfd7f7..b8ca4d4bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,10 @@ - markus@cvs.openbsd.org 2013/11/06 16:52:11 [monitor_wrap.c] fix rekeying for AES-GCM modes; ok deraadt + - djm@cvs.openbsd.org 2013/11/06 23:05:59 + [ssh-pkcs11.c] + from portable: s/true/true_val/ to avoid name collisions on dump platforms + RCSID sync only 20131104 - (djm) OpenBSD CVS Sync diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index b785d822c..9941e94ed 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11.c,v 1.9 2013/11/02 20:03:54 markus Exp $ */ +/* $OpenBSD: ssh-pkcs11.c,v 1.10 2013/11/06 23:05:59 djm Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. *