summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh-pkcs11.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 020dfd7f7..b8ca4d4bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
13 - markus@cvs.openbsd.org 2013/11/06 16:52:11 13 - markus@cvs.openbsd.org 2013/11/06 16:52:11
14 [monitor_wrap.c] 14 [monitor_wrap.c]
15 fix rekeying for AES-GCM modes; ok deraadt 15 fix rekeying for AES-GCM modes; ok deraadt
16 - djm@cvs.openbsd.org 2013/11/06 23:05:59
17 [ssh-pkcs11.c]
18 from portable: s/true/true_val/ to avoid name collisions on dump platforms
19 RCSID sync only
16 20
1720131104 2120131104
18 - (djm) OpenBSD CVS Sync 22 - (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 @@
1/* $OpenBSD: ssh-pkcs11.c,v 1.9 2013/11/02 20:03:54 markus Exp $ */ 1/* $OpenBSD: ssh-pkcs11.c,v 1.10 2013/11/06 23:05:59 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *