upstream: move other RCSIDs to before their respective license blocks

too no code change

OpenBSD-Commit-ID: ef5bf46b57726e4260a63b032b0b5ac3b4fe9cd4

diff --git a/chacha.c b/chacha.c
index a84c25ea88cea89c6abf879f9597a53246e7403d..729aa03db07f2c95057e255da14934d4099a6868 100644 (file)
--- 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 719f9c843d63f007d08cfdd744d08a7ed5007d17..e8d20c288097bb9a8b7cd0b3c997fec2babf7404 100644 (file)
--- 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 716f8d426a068a1ae0598cec6022fa54a84e78c9..4471fe2d28962e106daaab0850322107728d077f 100644 (file)
--- 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 6fd1fc8cd13cf75e8a7c9e3f5e81d5cb7db572cd..de4d8877025d9db51a325f6fb440ea854128bc86 100644 (file)
--- 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 603a1ab4e4fd9723103ea775483b03919aaf9f6e..45a2f2c2781ca90090bde3d62494baed8e1a04cb 100644 (file)
--- 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