- 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

diff --git a/ChangeLog b/ChangeLog
index 020dfd7f769047029ca188df7e8bd46dbfa29eff..b8ca4d4bf58fc636a99e3bf7d10d7d70924f41bc 100644 (file)
--- 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 b785d822cd9311cf90a30020763a3c2e6beeec42..9941e94ed4dd992ca32aaf4bd9ce7e2bcf7d843c 100644 (file)
--- 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.
  *