diff options
| author | des <des@FreeBSD.org> | 2014-03-24 19:15:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-03-24 19:15:13 +0000 |
| commit | fc833dce1b5bf6fcabeb19ab1dd8cca53f61f702 (patch) | |
| tree | 14111e04c59f0b565d8a20f5e13a60b25ce5b287 /crypto/openssh/openbsd-compat | |
| parent | 4d523456c74f0ddc517b308316bcd000a9aabab5 (diff) | |
| download | FreeBSD-src-fc833dce1b5bf6fcabeb19ab1dd8cca53f61f702.zip FreeBSD-src-fc833dce1b5bf6fcabeb19ab1dd8cca53f61f702.tar.gz | |
Add a pre-merge script which reverts mechanical changes such as added
$FreeBSD$ tags and man page dates.
Add a post-merge script which reapplies these changes.
Run both scripts to normalize the existing code base. As a result, many
files which should have had $FreeBSD$ tags but didn't now have them.
Partly rewrite the upgrade instructions and remove the now outdated
list of tricks.
Diffstat (limited to 'crypto/openssh/openbsd-compat')
| -rw-r--r-- | crypto/openssh/openbsd-compat/blowfish.c | 2 | ||||
| -rw-r--r-- | crypto/openssh/openbsd-compat/bsd-misc.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssh/openbsd-compat/blowfish.c b/crypto/openssh/openbsd-compat/blowfish.c index e10f7e7..37e0638 100644 --- a/crypto/openssh/openbsd-compat/blowfish.c +++ b/crypto/openssh/openbsd-compat/blowfish.c @@ -1,4 +1,5 @@ /* $OpenBSD: blowfish.c,v 1.18 2004/11/02 17:23:26 hshoexer Exp $ */ +/* $FreeBSD$ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -40,6 +41,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #if !defined(HAVE_BCRYPT_PBKDF) && (!defined(HAVE_BLOWFISH_INITSTATE) || \ !defined(HAVE_BLOWFISH_EXPAND0STATE) || !defined(HAVE_BLF_ENC)) diff --git a/crypto/openssh/openbsd-compat/bsd-misc.h b/crypto/openssh/openbsd-compat/bsd-misc.h index e4fa805..e2fd646 100644 --- a/crypto/openssh/openbsd-compat/bsd-misc.h +++ b/crypto/openssh/openbsd-compat/bsd-misc.h @@ -1,4 +1,5 @@ /* $Id: bsd-misc.h,v 1.25 2013/08/04 11:48:41 dtucker Exp $ */ +/* $FreeBSD$ */ /* * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> @@ -20,6 +21,7 @@ #define _BSD_MISC_H #include "includes.h" +__RCSID("$FreeBSD$"); char *ssh_get_progname(char *); |
