summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/README2
-rw-r--r--crypto/heimdal/FREEBSD-Xlist2
-rw-r--r--crypto/heimdal/admin/ktutil_locl.h2
-rw-r--r--crypto/heimdal/appl/ftp/ftp/ftp_locl.h2
-rw-r--r--crypto/heimdal/appl/rcp/extern.h2
-rw-r--r--crypto/heimdal/appl/rcp/util.c2
-rw-r--r--crypto/heimdal/kadmin/kadmin_locl.h2
-rw-r--r--crypto/heimdal/kdc/headers.h2
-rw-r--r--crypto/heimdal/lib/hdb/hdb_locl.h2
-rw-r--r--crypto/heimdal/lib/krb5/crypto.c2
-rw-r--r--crypto/heimdal/lib/krb5/krb5_locl.h2
-rw-r--r--crypto/openssh/.cvsignore24
-rw-r--r--crypto/openssh/FREEBSD-Xlist2
-rw-r--r--crypto/openssh/FREEBSD-tricks2
-rw-r--r--crypto/openssh/FREEBSD-upgrade2
-rw-r--r--crypto/openssh/acconfig.h2
-rw-r--r--crypto/openssh/auth-chall.c2
-rw-r--r--crypto/openssh/auth-krb5.c2
-rw-r--r--crypto/openssh/auth-pam.c2
-rw-r--r--crypto/openssh/auth-pam.h2
-rw-r--r--crypto/openssh/auth-passwd.c2
-rw-r--r--crypto/openssh/auth-skey.c2
-rw-r--r--crypto/openssh/auth.c2
-rw-r--r--crypto/openssh/auth.h2
-rw-r--r--crypto/openssh/auth1.c2
-rw-r--r--crypto/openssh/auth2-chall.c2
-rw-r--r--crypto/openssh/auth2-kbdint.c2
-rw-r--r--crypto/openssh/auth2.c2
-rw-r--r--crypto/openssh/bufaux.c2
-rw-r--r--crypto/openssh/compat.c2
-rw-r--r--crypto/openssh/config.h2
-rw-r--r--crypto/openssh/configure.ac2
-rw-r--r--crypto/openssh/includes.h2
-rw-r--r--crypto/openssh/log.h2
-rw-r--r--crypto/openssh/loginrec.c2
-rw-r--r--crypto/openssh/monitor.c2
-rw-r--r--crypto/openssh/monitor.h2
-rw-r--r--crypto/openssh/monitor_wrap.c2
-rw-r--r--crypto/openssh/monitor_wrap.h2
-rw-r--r--crypto/openssh/myproposal.h2
-rw-r--r--crypto/openssh/openbsd-compat/.cvsignore1
-rw-r--r--crypto/openssh/openbsd-compat/fake-rfc2553.h2
-rw-r--r--crypto/openssh/readconf.c2
-rw-r--r--crypto/openssh/scard/.cvsignore2
-rw-r--r--crypto/openssh/servconf.c2
-rw-r--r--crypto/openssh/servconf.h2
-rw-r--r--crypto/openssh/session.c2
-rw-r--r--crypto/openssh/ssh-agent.c2
-rw-r--r--crypto/openssh/ssh.12
-rw-r--r--crypto/openssh/ssh.c2
-rw-r--r--crypto/openssh/ssh_config2
-rw-r--r--crypto/openssh/ssh_config.52
-rw-r--r--crypto/openssh/sshd.82
-rw-r--r--crypto/openssh/sshd.c2
-rw-r--r--crypto/openssh/sshd_config2
-rw-r--r--crypto/openssh/sshd_config.52
-rw-r--r--crypto/openssh/version.c2
-rw-r--r--crypto/openssh/version.h2
-rw-r--r--crypto/openssl/FREEBSD-Xlist2
-rw-r--r--crypto/openssl/apps/openssl.cnf2
-rw-r--r--crypto/openssl/crypto/rsa/rsa.h2
-rw-r--r--crypto/openssl/crypto/rsa/rsa_eay.c2
-rw-r--r--crypto/openssl/crypto/rsa/rsa_lib.c2
-rw-r--r--crypto/openssl/util/pl/Mingw32.pl2
64 files changed, 61 insertions, 88 deletions
diff --git a/crypto/README b/crypto/README
index a3c5ccf50a1c..d385e8b8aa75 100644
--- a/crypto/README
+++ b/crypto/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/README,v 1.6 2001/02/10 04:47:47 kris Exp $
This directory is for the EXACT same use as src/contrib, except it
holds crypto sources. In other words, this holds raw sources obtained
diff --git a/crypto/heimdal/FREEBSD-Xlist b/crypto/heimdal/FREEBSD-Xlist
index 6415adc6e6c8..ff74c9a899df 100644
--- a/crypto/heimdal/FREEBSD-Xlist
+++ b/crypto/heimdal/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/heimdal/FREEBSD-Xlist,v 1.1 2003/10/09 19:35:38 nectar Exp $
TODO*
*.info*
*.cat[0-9]
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h
index cf6a6f3548da..69805faf5bc1 100644
--- a/crypto/heimdal/admin/ktutil_locl.h
+++ b/crypto/heimdal/admin/ktutil_locl.h
@@ -33,7 +33,7 @@
/*
* $Id: ktutil_locl.h,v 1.18 2002/09/10 20:03:45 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/admin/ktutil_locl.h,v 1.7 2002/09/16 21:07:08 nectar Exp $
*/
#ifndef __KTUTIL_LOCL_H__
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
index f371ca1e1edf..d6d88b727c6d 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
+++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
@@ -32,7 +32,7 @@
*/
/* $Id: ftp_locl.h,v 1.37 2002/09/10 20:03:46 joda Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h,v 1.6 2002/09/16 21:07:10 nectar Exp $ */
#ifndef __FTP_LOCL_H__
#define __FTP_LOCL_H__
diff --git a/crypto/heimdal/appl/rcp/extern.h b/crypto/heimdal/appl/rcp/extern.h
index a98456d305e2..6ec00c410508 100644
--- a/crypto/heimdal/appl/rcp/extern.h
+++ b/crypto/heimdal/appl/rcp/extern.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/appl/rcp/extern.h,v 1.1.1.1 2001/02/13 16:44:17 assar Exp $
*/
typedef struct {
diff --git a/crypto/heimdal/appl/rcp/util.c b/crypto/heimdal/appl/rcp/util.c
index 3621d307a425..619a40f68050 100644
--- a/crypto/heimdal/appl/rcp/util.c
+++ b/crypto/heimdal/appl/rcp/util.c
@@ -37,7 +37,7 @@
static char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/crypto/heimdal/appl/rcp/util.c,v 1.1.1.2 2002/02/19 15:46:05 nectar Exp $";
#endif /* not lint */
#endif
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h
index 0b36127db0d5..55b0112062de 100644
--- a/crypto/heimdal/kadmin/kadmin_locl.h
+++ b/crypto/heimdal/kadmin/kadmin_locl.h
@@ -33,7 +33,7 @@
/*
* $Id: kadmin_locl.h,v 1.41 2002/09/10 20:04:45 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/kadmin/kadmin_locl.h,v 1.7 2002/09/16 21:07:10 nectar Exp $
*/
#ifndef __ADMIN_LOCL_H__
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h
index 96db9248bebb..dd7f88622909 100644
--- a/crypto/heimdal/kdc/headers.h
+++ b/crypto/heimdal/kdc/headers.h
@@ -33,7 +33,7 @@
/*
* $Id: headers.h,v 1.15 2002/09/10 20:04:46 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/kdc/headers.h,v 1.7 2002/09/16 21:07:11 nectar Exp $
*/
#ifndef __HEADERS_H__
diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/crypto/heimdal/lib/hdb/hdb_locl.h
index c4f1ea2d30f1..e1834683a572 100644
--- a/crypto/heimdal/lib/hdb/hdb_locl.h
+++ b/crypto/heimdal/lib/hdb/hdb_locl.h
@@ -32,7 +32,7 @@
*/
/* $Id: hdb_locl.h,v 1.18.4.1 2003/09/10 22:04:39 lha Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/hdb/hdb_locl.h,v 1.8 2004/04/03 21:31:09 nectar Exp $ */
#ifndef __HDB_LOCL_H__
#define __HDB_LOCL_H__
diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c
index d1c1c9d3d79f..50165e6ce579 100644
--- a/crypto/heimdal/lib/krb5/crypto.c
+++ b/crypto/heimdal/lib/krb5/crypto.c
@@ -33,7 +33,7 @@
#include "krb5_locl.h"
RCSID("$Id: crypto.c,v 1.73.2.4 2004/03/06 16:38:00 lha Exp $");
-/* RCSID("$FreeBSD$"); */
+/* RCSID("$FreeBSD: src/crypto/heimdal/lib/krb5/crypto.c,v 1.10 2004/04/03 21:31:09 nectar Exp $"); */
#undef CRYPTO_DEBUG
#ifdef CRYPTO_DEBUG
diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/crypto/heimdal/lib/krb5/krb5_locl.h
index be7997e28c90..f4258ab01b86 100644
--- a/crypto/heimdal/lib/krb5/krb5_locl.h
+++ b/crypto/heimdal/lib/krb5/krb5_locl.h
@@ -32,7 +32,7 @@
*/
/* $Id: krb5_locl.h,v 1.71 2002/09/10 20:10:45 joda Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/krb5/krb5_locl.h,v 1.9 2002/09/16 21:07:11 nectar Exp $ */
#ifndef __KRB5_LOCL_H__
#define __KRB5_LOCL_H__
diff --git a/crypto/openssh/.cvsignore b/crypto/openssh/.cvsignore
deleted file mode 100644
index 12de9ef50509..000000000000
--- a/crypto/openssh/.cvsignore
+++ /dev/null
@@ -1,24 +0,0 @@
-ssh
-scp
-sshd
-ssh-add
-ssh-keygen
-ssh-keyscan
-ssh-keysign
-ssh-agent
-sftp-server
-sftp
-configure
-config.h.in
-config.h
-config.status
-config.cache
-config.log
-stamp-h.in
-Makefile
-ssh_prng_cmds
-*.out
-*.0
-buildit.sh
-autom4te.cache
-ssh-rand-helper
diff --git a/crypto/openssh/FREEBSD-Xlist b/crypto/openssh/FREEBSD-Xlist
index 6d8ac040866f..5064ba5271e0 100644
--- a/crypto/openssh/FREEBSD-Xlist
+++ b/crypto/openssh/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-Xlist,v 1.3 2004/02/26 10:37:34 des Exp $
*.0
*/.cvsignore
.cvsignore
diff --git a/crypto/openssh/FREEBSD-tricks b/crypto/openssh/FREEBSD-tricks
index 4ae543986b3f..7f138deeda85 100644
--- a/crypto/openssh/FREEBSD-tricks
+++ b/crypto/openssh/FREEBSD-tricks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.4 2003/09/19 11:29:51 des Exp $
# Shell code to remove FreeBSD tags before merging
grep -rl '\$Fre.BSD:' . >tags
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 331d83add1db..b50213d004a4 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -126,4 +126,4 @@ Suzanne Vega, and a Sanford's #69 Deluxe Marker.
-- des@FreeBSD.org
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.8 2004/02/26 10:57:28 des Exp $
diff --git a/crypto/openssh/acconfig.h b/crypto/openssh/acconfig.h
index 02e9e4f96ba5..82aa84689819 100644
--- a/crypto/openssh/acconfig.h
+++ b/crypto/openssh/acconfig.h
@@ -1,5 +1,5 @@
/* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/acconfig.h,v 1.9 2004/04/20 09:46:39 des Exp $ */
/*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved.
diff --git a/crypto/openssh/auth-chall.c b/crypto/openssh/auth-chall.c
index dbe04cdf2d40..12cddf508cd7 100644
--- a/crypto/openssh/auth-chall.c
+++ b/crypto/openssh/auth-chall.c
@@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth-chall.c,v 1.9 2003/11/03 09:03:37 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-chall.c,v 1.8 2004/02/26 10:52:30 des Exp $");
#include "auth.h"
#include "log.h"
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index 42b802678d7f..ce10c4d38374 100644
--- a/crypto/openssh/auth-krb5.c
+++ b/crypto/openssh/auth-krb5.c
@@ -29,7 +29,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.17 2004/04/20 09:46:39 des Exp $");
#include "ssh.h"
#include "ssh1.h"
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
index 9e30219fb8ab..e78e37d90069 100644
--- a/crypto/openssh/auth-pam.c
+++ b/crypto/openssh/auth-pam.c
@@ -32,7 +32,7 @@
/* Based on $xFreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h"
RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-pam.c,v 1.14 2004/04/20 09:46:39 des Exp $");
#ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H)
diff --git a/crypto/openssh/auth-pam.h b/crypto/openssh/auth-pam.h
index ff4b6f6bd208..409542695224 100644
--- a/crypto/openssh/auth-pam.h
+++ b/crypto/openssh/auth-pam.h
@@ -1,5 +1,5 @@
/* $Id: auth-pam.h,v 1.25 2004/03/08 12:04:07 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/auth-pam.h,v 1.9 2004/04/20 09:46:39 des Exp $ */
/*
* Copyright (c) 2000 Damien Miller. All rights reserved.
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c
index 38f610ab5a95..b0042c2f7841 100644
--- a/crypto/openssh/auth-passwd.c
+++ b/crypto/openssh/auth-passwd.c
@@ -37,7 +37,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth-passwd.c,v 1.31 2004/01/30 09:48:57 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-passwd.c,v 1.17 2004/04/20 09:46:39 des Exp $");
#include "packet.h"
#include "log.h"
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c
index 331e9a7571ad..b8bcf2c5dbfb 100644
--- a/crypto/openssh/auth-skey.c
+++ b/crypto/openssh/auth-skey.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth-skey.c,v 1.15 2004/04/20 09:46:39 des Exp $");
#ifdef SKEY
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c
index 6bed01c9685f..2c80bad7201c 100644
--- a/crypto/openssh/auth.c
+++ b/crypto/openssh/auth.c
@@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth.c,v 1.51 2003/11/21 11:57:02 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.15 2004/02/26 10:52:30 des Exp $");
#ifdef HAVE_LOGIN_H
#include <login.h>
diff --git a/crypto/openssh/auth.h b/crypto/openssh/auth.h
index 83841b6591aa..9b3026db9a15 100644
--- a/crypto/openssh/auth.h
+++ b/crypto/openssh/auth.h
@@ -1,5 +1,5 @@
/* $OpenBSD: auth.h,v 1.49 2004/01/30 09:48:57 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/auth.h,v 1.13 2004/04/20 09:46:39 des Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c
index 7dd3a4a5044b..e526411364ab 100644
--- a/crypto/openssh/auth1.c
+++ b/crypto/openssh/auth1.c
@@ -11,7 +11,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth1.c,v 1.55 2003/11/08 16:02:40 jakob Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth1.c,v 1.30 2004/04/20 09:46:39 des Exp $");
#include "xmalloc.h"
#include "rsa.h"
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c
index 4e2a0f91785d..05c46a4a0f7f 100644
--- a/crypto/openssh/auth2-chall.c
+++ b/crypto/openssh/auth2-chall.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: auth2-chall.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-chall.c,v 1.8 2004/01/07 11:16:23 des Exp $");
#include "ssh2.h"
#include "auth.h"
diff --git a/crypto/openssh/auth2-kbdint.c b/crypto/openssh/auth2-kbdint.c
index 15c20b33921e..8e75d224bbc6 100644
--- a/crypto/openssh/auth2-kbdint.c
+++ b/crypto/openssh/auth2-kbdint.c
@@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth2-kbdint.c,v 1.2 2002/05/31 11:35:15 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2-kbdint.c,v 1.2 2002/12/14 13:48:13 des Exp $");
#include "packet.h"
#include "auth.h"
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c
index 756f33c4d04c..7fb6f4e9156b 100644
--- a/crypto/openssh/auth2.c
+++ b/crypto/openssh/auth2.c
@@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth2.c,v 1.104 2003/11/04 08:54:09 djm Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.23 2004/04/20 09:46:39 des Exp $");
#include "canohost.h"
#include "ssh2.h"
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c
index adbb4bdd5887..1657824dc107 100644
--- a/crypto/openssh/bufaux.c
+++ b/crypto/openssh/bufaux.c
@@ -38,7 +38,7 @@
#include "includes.h"
RCSID("$OpenBSD: bufaux.c,v 1.32 2004/02/23 15:12:46 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/bufaux.c,v 1.15 2004/02/26 10:52:30 des Exp $");
#include <openssl/bn.h>
#include "bufaux.h"
diff --git a/crypto/openssh/compat.c b/crypto/openssh/compat.c
index 482caba8f758..6648efca3706 100644
--- a/crypto/openssh/compat.c
+++ b/crypto/openssh/compat.c
@@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: compat.c,v 1.70 2003/11/02 11:01:03 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/compat.c,v 1.11 2004/02/26 10:52:30 des Exp $");
#include "buffer.h"
#include "packet.h"
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index ddf231e09f28..db67ec2c2fe5 100644
--- a/crypto/openssh/config.h
+++ b/crypto/openssh/config.h
@@ -1,7 +1,7 @@
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/config.h,v 1.9 2004/04/20 09:49:37 des Exp $ */
/*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved.
diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac
index 41fdc34bde39..85688a084d67 100644
--- a/crypto/openssh/configure.ac
+++ b/crypto/openssh/configure.ac
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/configure.ac,v 1.9 2004/04/20 09:46:39 des Exp $
# $Id: configure.ac,v 1.202 2004/02/24 05:47:04 tim Exp $
#
# Copyright (c) 1999-2004 Damien Miller
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h
index 32e9b8420bbd..2a14893d0c23 100644
--- a/crypto/openssh/includes.h
+++ b/crypto/openssh/includes.h
@@ -1,5 +1,5 @@
/* $OpenBSD: includes.h,v 1.17 2002/01/26 16:44:22 stevesk Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/includes.h,v 1.17 2004/02/26 10:52:30 des Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h
index ca4d7bf6da97..6fb01e8a1a55 100644
--- a/crypto/openssh/log.h
+++ b/crypto/openssh/log.h
@@ -1,5 +1,5 @@
/* $OpenBSD: log.h,v 1.10 2003/09/23 20:17:11 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/log.h,v 1.5 2004/02/26 10:52:30 des Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c
index 90f9f7474c76..10e49699b0bb 100644
--- a/crypto/openssh/loginrec.c
+++ b/crypto/openssh/loginrec.c
@@ -158,7 +158,7 @@
#include "log.h"
#include "atomicio.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.7 2004/04/20 09:46:39 des Exp $");
RCSID("$Id: loginrec.c,v 1.54 2004/02/10 05:49:35 dtucker Exp $");
#ifdef HAVE_UTIL_H
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
index c04d1f78553b..883af8709acd 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -26,7 +26,7 @@
#include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.15 2004/04/20 09:46:39 des Exp $");
#include <openssl/dh.h>
diff --git a/crypto/openssh/monitor.h b/crypto/openssh/monitor.h
index feab93fbd1f3..d651bb48ca26 100644
--- a/crypto/openssh/monitor.h
+++ b/crypto/openssh/monitor.h
@@ -1,5 +1,5 @@
/* $OpenBSD: monitor.h,v 1.13 2003/11/17 11:06:07 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/monitor.h,v 1.5 2004/02/26 10:52:31 des Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/monitor_wrap.c b/crypto/openssh/monitor_wrap.c
index b4f2a89cd694..1935a37cf01d 100644
--- a/crypto/openssh/monitor_wrap.c
+++ b/crypto/openssh/monitor_wrap.c
@@ -26,7 +26,7 @@
#include "includes.h"
RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/monitor_wrap.c,v 1.8 2004/04/20 09:46:39 des Exp $");
#include <openssl/bn.h>
#include <openssl/dh.h>
diff --git a/crypto/openssh/monitor_wrap.h b/crypto/openssh/monitor_wrap.h
index a7c9edd1f10c..e860d9a065b1 100644
--- a/crypto/openssh/monitor_wrap.h
+++ b/crypto/openssh/monitor_wrap.h
@@ -1,5 +1,5 @@
/* $OpenBSD: monitor_wrap.h,v 1.13 2003/11/17 11:06:07 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/monitor_wrap.h,v 1.6 2004/04/20 09:46:39 des Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h
index 065dd4483fef..8e99d48efa8f 100644
--- a/crypto/openssh/myproposal.h
+++ b/crypto/openssh/myproposal.h
@@ -1,5 +1,5 @@
/* $OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/myproposal.h,v 1.6 2004/01/07 11:16:23 des Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
diff --git a/crypto/openssh/openbsd-compat/.cvsignore b/crypto/openssh/openbsd-compat/.cvsignore
deleted file mode 100644
index f3c7a7c5da68..000000000000
--- a/crypto/openssh/openbsd-compat/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/crypto/openssh/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h
index a19a42f3f906..a558d851ae2a 100644
--- a/crypto/openssh/openbsd-compat/fake-rfc2553.h
+++ b/crypto/openssh/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/openbsd-compat/fake-rfc2553.h,v 1.4 2004/04/20 09:46:41 des Exp $ */
/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */
/*
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index c62b9432b295..c745c5044b1e 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.23 2004/04/20 09:47:13 des Exp $");
RCSID("$OpenBSD: readconf.c,v 1.127 2003/12/16 15:49:51 markus Exp $");
#include "ssh.h"
diff --git a/crypto/openssh/scard/.cvsignore b/crypto/openssh/scard/.cvsignore
deleted file mode 100644
index 5349d34aeabd..000000000000
--- a/crypto/openssh/scard/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Ssh.bin
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 2afd6eb947cb..10c0bf75f2d8 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -11,7 +11,7 @@
#include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.130 2003/12/23 16:12:10 jakob Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.44 2004/02/26 10:52:31 des Exp $");
#include "ssh.h"
#include "log.h"
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h
index 7b1ba7f81ebc..47d8ea421600 100644
--- a/crypto/openssh/servconf.h
+++ b/crypto/openssh/servconf.h
@@ -1,5 +1,5 @@
/* $OpenBSD: servconf.h,v 1.67 2003/12/23 16:12:10 jakob Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/servconf.h,v 1.15 2004/02/26 10:52:31 des Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 3f9049f3593e..da2d204bb545 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -34,7 +34,7 @@
#include "includes.h"
RCSID("$OpenBSD: session.c,v 1.172 2004/01/30 09:48:57 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.44 2004/04/20 09:46:40 des Exp $");
#include "ssh.h"
#include "ssh1.h"
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 29aa7dd8f971..aeb5c6ed4017 100644
--- a/crypto/openssh/ssh-agent.c
+++ b/crypto/openssh/ssh-agent.c
@@ -36,7 +36,7 @@
#include "includes.h"
#include "openbsd-compat/sys-queue.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $");
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/ssh-agent.c,v 1.22 2004/04/20 09:46:40 des Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1
index da812d6a0bdb..d70ea9206865 100644
--- a/crypto/openssh/ssh.1
+++ b/crypto/openssh/ssh.1
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.29 2004/04/20 09:46:40 des Exp $
.\" $OpenBSD: ssh.1,v 1.181 2003/12/16 15:49:51 markus Exp $
.Dd September 25, 1999
.Dt SSH 1
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index d4535b8737ef..e511ce99940a 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/ssh.c,v 1.26 2004/04/20 09:46:40 des Exp $");
RCSID("$OpenBSD: ssh.c,v 1.206 2003/12/16 15:49:51 markus Exp $");
#include <openssl/evp.h>
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 31daf59790b5..b776003c25ab 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -1,5 +1,5 @@
# $OpenBSD: ssh_config,v 1.19 2003/08/13 08:46:31 markus Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/ssh_config,v 1.25 2004/04/20 09:37:28 des Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index ee8baea8d3ad..1436c7986c6a 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.15 2004/04/20 09:46:40 des Exp $
.\" $OpenBSD: ssh_config.5,v 1.28 2003/12/16 15:49:51 markus Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 2ed44cca7f13..6d06d587ce09 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd.8,v 1.200 2003/10/08 08:27:36 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.29 2004/02/26 10:52:31 des Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 22c2e3d0a535..1b0fd6bd91b2 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-RCSID("$FreeBSD$");
+RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.37 2004/04/20 09:46:40 des Exp $");
RCSID("$OpenBSD: sshd.c,v 1.286 2004/02/23 12:02:33 markus Exp $");
#include <openssl/dh.h>
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 2f7c103b68d9..4f2c7e5de966 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -1,5 +1,5 @@
# $OpenBSD: sshd_config,v 1.68 2003/12/29 16:39:50 millert Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/sshd_config,v 1.40 2004/04/20 09:37:29 des Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 1e6210422e58..39fb45abfd8a 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.21 2004/04/20 09:46:40 des Exp $
.\" $OpenBSD: sshd_config.5,v 1.28 2004/02/17 19:35:21 jmc Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
diff --git a/crypto/openssh/version.c b/crypto/openssh/version.c
index a6614397fd35..fd2394910caa 100644
--- a/crypto/openssh/version.c
+++ b/crypto/openssh/version.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/crypto/openssh/version.c,v 1.4 2002/10/29 10:16:02 des Exp $
*/
#include "includes.h"
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 7acdecb52230..30f943eafdb1 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/version.h,v 1.27 2004/04/20 09:46:40 des Exp $ */
/* $OpenBSD: version.h,v 1.40 2004/02/23 15:16:46 markus Exp $ */
#ifndef SSH_VERSION
diff --git a/crypto/openssl/FREEBSD-Xlist b/crypto/openssl/FREEBSD-Xlist
index 47a1a4ccf9f6..0d290f4682f4 100644
--- a/crypto/openssl/FREEBSD-Xlist
+++ b/crypto/openssl/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.5 2003/10/01 12:21:16 nectar Exp $
INSTALL.DJGPP
INSTALL.MacOS
INSTALL.OS2
diff --git a/crypto/openssl/apps/openssl.cnf b/crypto/openssl/apps/openssl.cnf
index 9256b4debda7..a1954b97628f 100644
--- a/crypto/openssl/apps/openssl.cnf
+++ b/crypto/openssl/apps/openssl.cnf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssl/apps/openssl.cnf,v 1.6 2004/03/17 17:44:38 nectar Exp $
#
# OpenSSL example configuration file.
# This is mostly being used for generation of certificate requests.
diff --git a/crypto/openssl/crypto/rsa/rsa.h b/crypto/openssl/crypto/rsa/rsa.h
index 1ea0fe10a535..f0f86b8467e6 100644
--- a/crypto/openssl/crypto/rsa/rsa.h
+++ b/crypto/openssl/crypto/rsa/rsa.h
@@ -55,7 +55,7 @@
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa.h,v 1.10 2003/10/01 12:37:50 nectar Exp $ */
#ifndef HEADER_RSA_H
#define HEADER_RSA_H
diff --git a/crypto/openssl/crypto/rsa/rsa_eay.c b/crypto/openssl/crypto/rsa/rsa_eay.c
index 5f7a1f20a359..ac207c240039 100644
--- a/crypto/openssl/crypto/rsa/rsa_eay.c
+++ b/crypto/openssl/crypto/rsa/rsa_eay.c
@@ -55,7 +55,7 @@
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa_eay.c,v 1.12 2003/10/01 12:37:50 nectar Exp $ */
#include <stdio.h>
#include "cryptlib.h"
diff --git a/crypto/openssl/crypto/rsa/rsa_lib.c b/crypto/openssl/crypto/rsa/rsa_lib.c
index 1ed3b3bc0a06..2397171a6d25 100644
--- a/crypto/openssl/crypto/rsa/rsa_lib.c
+++ b/crypto/openssl/crypto/rsa/rsa_lib.c
@@ -55,7 +55,7 @@
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa_lib.c,v 1.10 2003/10/01 12:37:50 nectar Exp $ */
#include <stdio.h>
#include <openssl/crypto.h>
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl
index 20a15095023c..bde4d88e1e0e 100644
--- a/crypto/openssl/util/pl/Mingw32.pl
+++ b/crypto/openssl/util/pl/Mingw32.pl
@@ -1,5 +1,5 @@
#!/usr/local/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssl/util/pl/Mingw32.pl,v 1.6 2003/10/01 12:37:51 nectar Exp $
#
# Mingw32.pl -- Mingw
#