summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-07 13:38:35 +1100
committerDamien Miller <djm@mindrot.org>2013-11-07 13:38:35 +1100
commitc8908aabff252f5da772d4e679479c2b7d18cac1 (patch)
tree2fce211a8cd16dc297cd4c9f345e30ea6b16d930
parent49c145c5e89b9d7d48e84328d6347d5ad640b567 (diff)
- 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
-rw-r--r--ChangeLog4
-rw-r--r--ssh-pkcs11.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 020dfd7f..b8ca4d4b 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 b785d822..9941e94e 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.
*