summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-24 07:16:08 +0100
committerDamien Miller <djm@mindrot.org>2010-02-24 07:16:08 +0100
commit05abd2c96876b959f4a2f71671652064fcedda0d (patch)
treeb7940498b1c6d4dddf6e3ae22ddd84c22a2d313f
parent- (djm) [configure.ac] Enable PKCS#11 support only when we find a working (diff)
downloadopenssh-05abd2c96876b959f4a2f71671652064fcedda0d.tar.xz
openssh-05abd2c96876b959f4a2f71671652064fcedda0d.zip
- (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
[ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable
-rw-r--r--ChangeLog4
-rw-r--r--pkcs11.h1
-rw-r--r--ssh-pkcs11-client.c1
-rw-r--r--ssh-pkcs11-helper.c1
-rw-r--r--ssh-pkcs11.c1
-rw-r--r--ssh-pkcs11.h1
6 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 83259b5fd..ac08efa4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20100224
+ - (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
+ [ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable
+
20100212
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/02/02 22:49:34
diff --git a/pkcs11.h b/pkcs11.h
index 223f20ff3..2cde5b3f4 100644
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pkcs11.h,v 1.2 2010/02/24 06:12:53 djm Exp $ */
/* pkcs11.h
Copyright 2006, 2007 g10 Code GmbH
Copyright 2006 Andreas Jellinghaus
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index 37050e04d..650c37342 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-pkcs11-client.c,v 1.2 2010/02/24 06:12:53 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index 3b44f7c30..1684ab0c2 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-pkcs11-helper.c,v 1.3 2010/02/24 06:12:53 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 821e9f840..7536f92a6 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-pkcs11.c,v 1.4 2010/02/24 06:12:53 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*
diff --git a/ssh-pkcs11.h b/ssh-pkcs11.h
index fae41a7b5..59f456adf 100644
--- a/ssh-pkcs11.h
+++ b/ssh-pkcs11.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-pkcs11.h,v 1.2 2010/02/24 06:12:53 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*