summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2023-07-17 05:26:38 +0000
committerDamien Miller <djm@mindrot.org>2023-07-17 15:33:51 +1000
commitdc1dbe94cf6532bd546a3373ad436404f8850e5f (patch)
tree445ffbaae16e9aa53b26680e5571c0c2f631f6c3
parentebe11044681caff78834ca6b78311ad19c1860b8 (diff)
upstream: move other RCSIDs to before their respective license blocks
too no code change OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4
-rw-r--r--chacha.c3
-rw-r--r--cipher-chachapoly-libcrypto.c3
-rw-r--r--cipher-chachapoly.c3
-rw-r--r--poly1305.c3
-rw-r--r--servconf.c3
5 files changed, 5 insertions, 10 deletions
diff --git a/chacha.c b/chacha.c
index a84c25ea..729aa03d 100644
--- a/chacha.c
+++ b/chacha.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: chacha.c,v 1.2 2023/07/17 05:26:38 djm Exp $ */
/*
chacha-merged.c version 20080118
D. J. Bernstein
@@ -8,8 +9,6 @@ Public domain.
#include "chacha.h"
-/* $OpenBSD: chacha.c,v 1.1 2013/11/21 00:45:44 djm Exp $ */
-
typedef unsigned char u8;
typedef unsigned int u32;
diff --git a/cipher-chachapoly-libcrypto.c b/cipher-chachapoly-libcrypto.c
index 719f9c84..e8d20c28 100644
--- a/cipher-chachapoly-libcrypto.c
+++ b/cipher-chachapoly-libcrypto.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-chachapoly-libcrypto.c,v 1.2 2023/07/17 05:26:38 djm Exp $ */
/*
* Copyright (c) 2013 Damien Miller <djm@mindrot.org>
*
@@ -14,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $OpenBSD: cipher-chachapoly-libcrypto.c,v 1.1 2020/04/03 04:32:21 djm Exp $ */
-
#include "includes.h"
#ifdef WITH_OPENSSL
#include "openbsd-compat/openssl-compat.h"
diff --git a/cipher-chachapoly.c b/cipher-chachapoly.c
index 716f8d42..4471fe2d 100644
--- a/cipher-chachapoly.c
+++ b/cipher-chachapoly.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cipher-chachapoly.c,v 1.10 2023/07/17 05:26:38 djm Exp $ */
/*
* Copyright (c) 2013 Damien Miller <djm@mindrot.org>
*
@@ -14,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $OpenBSD: cipher-chachapoly.c,v 1.9 2020/04/03 04:27:03 djm Exp $ */
-
#include "includes.h"
#ifdef WITH_OPENSSL
#include "openbsd-compat/openssl-compat.h"
diff --git a/poly1305.c b/poly1305.c
index 6fd1fc8c..de4d8877 100644
--- a/poly1305.c
+++ b/poly1305.c
@@ -1,10 +1,9 @@
+/* $OpenBSD: poly1305.c,v 1.4 2023/07/17 05:26:38 djm Exp $ */
/*
* Public Domain poly1305 from Andrew Moon
* poly1305-donna-unrolled.c from https://github.com/floodyberry/poly1305-donna
*/
-/* $OpenBSD: poly1305.c,v 1.3 2013/12/19 22:57:13 djm Exp $ */
-
#include "includes.h"
#include <sys/types.h>
diff --git a/servconf.c b/servconf.c
index 603a1ab4..45a2f2c2 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,4 @@
-
-/* $OpenBSD: servconf.c,v 1.395 2023/06/21 05:10:26 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.396 2023/07/17 05:26:38 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved