Merge remote-tracking branch 'origin/stable/11' into devel-11

26 files changed, 52 insertions, 52 deletions

diff --git a/secure/lib/libcrypto/amd64/aes-x86_64.S b/secure/lib/libcrypto/amd64/aes-x86_64.S
index 1a2d517..6ae6d2e 100644
--- a/secure/lib/libcrypto/amd64/aes-x86_64.S
+++ b/secure/lib/libcrypto/amd64/aes-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aes-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aes-x86_64.pl. */
 .text	
 .type	_x86_64_AES_encrypt,@function
 .align	16
diff --git a/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S b/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
index 34b0cc8..9112936 100644
--- a/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
+++ b/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-gcm-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-gcm-x86_64.pl. */
 .text	
 
 .type	_aesni_ctr32_ghash_6x,@function
diff --git a/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S b/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
index 49ee3e2..721fb91 100644
--- a/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
+++ b/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-mb-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-mb-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S b/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
index 8e440b7..814a532 100644
--- a/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
+++ b/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-sha1-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-sha1-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S b/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
index 46623d2..b6f0eeb 100644
--- a/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
+++ b/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-sha256-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-sha256-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/aesni-x86_64.S b/secure/lib/libcrypto/amd64/aesni-x86_64.S
index bb247de..50e4df6 100644
--- a/secure/lib/libcrypto/amd64/aesni-x86_64.S
+++ b/secure/lib/libcrypto/amd64/aesni-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-x86_64.pl. */
 .text	
 
 .globl	aesni_encrypt
diff --git a/secure/lib/libcrypto/amd64/bsaes-x86_64.S b/secure/lib/libcrypto/amd64/bsaes-x86_64.S
index 4890ed5..771bbe8 100644
--- a/secure/lib/libcrypto/amd64/bsaes-x86_64.S
+++ b/secure/lib/libcrypto/amd64/bsaes-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bsaes-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bsaes-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/cmll-x86_64.S b/secure/lib/libcrypto/amd64/cmll-x86_64.S
index 83e94b1..f2c39ab8 100644
--- a/secure/lib/libcrypto/amd64/cmll-x86_64.S
+++ b/secure/lib/libcrypto/amd64/cmll-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from cmll-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from cmll-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S b/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
index 67c214e..fcaa9c1 100644
--- a/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
+++ b/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ecp_nistz256-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ecp_nistz256-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/ghash-x86_64.S b/secure/lib/libcrypto/amd64/ghash-x86_64.S
index 66a0e72..a574122 100644
--- a/secure/lib/libcrypto/amd64/ghash-x86_64.S
+++ b/secure/lib/libcrypto/amd64/ghash-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ghash-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghash-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/md5-x86_64.S b/secure/lib/libcrypto/amd64/md5-x86_64.S
index 73231be..260a1b2 100644
--- a/secure/lib/libcrypto/amd64/md5-x86_64.S
+++ b/secure/lib/libcrypto/amd64/md5-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from md5-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from md5-x86_64.pl. */
 .text	
 .align	16
 
diff --git a/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S b/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
index 3f061c9..ae056a6 100644
--- a/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
+++ b/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-md5-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-md5-x86_64.pl. */
 .text	
 .align	16
 
diff --git a/secure/lib/libcrypto/amd64/rc4-x86_64.S b/secure/lib/libcrypto/amd64/rc4-x86_64.S
index 657f1b9..0bac5dd 100644
--- a/secure/lib/libcrypto/amd64/rc4-x86_64.S
+++ b/secure/lib/libcrypto/amd64/rc4-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/rsaz-avx2.S b/secure/lib/libcrypto/amd64/rsaz-avx2.S
index 2db5bfa..159d579 100644
--- a/secure/lib/libcrypto/amd64/rsaz-avx2.S
+++ b/secure/lib/libcrypto/amd64/rsaz-avx2.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rsaz-avx2.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rsaz-avx2.pl. */
 .text	
 
 .globl	rsaz_1024_sqr_avx2
diff --git a/secure/lib/libcrypto/amd64/rsaz-x86_64.S b/secure/lib/libcrypto/amd64/rsaz-x86_64.S
index f09f499..6056204 100644
--- a/secure/lib/libcrypto/amd64/rsaz-x86_64.S
+++ b/secure/lib/libcrypto/amd64/rsaz-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rsaz-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rsaz-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S b/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
index a672b28..1e089f4 100644
--- a/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
+++ b/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-mb-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-mb-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/sha1-x86_64.S b/secure/lib/libcrypto/amd64/sha1-x86_64.S
index 0edab29..cdb7fdf 100644
--- a/secure/lib/libcrypto/amd64/sha1-x86_64.S
+++ b/secure/lib/libcrypto/amd64/sha1-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S b/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
index 456bbc1..6474896 100644
--- a/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
+++ b/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha256-mb-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha256-mb-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/sha256-x86_64.S b/secure/lib/libcrypto/amd64/sha256-x86_64.S
index 1eb0b59..6b9c939 100644
--- a/secure/lib/libcrypto/amd64/sha256-x86_64.S
+++ b/secure/lib/libcrypto/amd64/sha256-x86_64.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha512-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/sha512-x86_64.S b/secure/lib/libcrypto/amd64/sha512-x86_64.S
index 5675a89..53b09f9 100644
--- a/secure/lib/libcrypto/amd64/sha512-x86_64.S
+++ b/secure/lib/libcrypto/amd64/sha512-x86_64.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha512-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/vpaes-x86_64.S b/secure/lib/libcrypto/amd64/vpaes-x86_64.S
index 7e060c5..7b0ef0d 100644
--- a/secure/lib/libcrypto/amd64/vpaes-x86_64.S
+++ b/secure/lib/libcrypto/amd64/vpaes-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from vpaes-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from vpaes-x86_64.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/wp-x86_64.S b/secure/lib/libcrypto/amd64/wp-x86_64.S
index cda35fa..a790655 100644
--- a/secure/lib/libcrypto/amd64/wp-x86_64.S
+++ b/secure/lib/libcrypto/amd64/wp-x86_64.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from wp-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from wp-x86_64.pl. */
 .text	
 
 .globl	whirlpool_block
diff --git a/secure/lib/libcrypto/amd64/x86_64-gf2m.S b/secure/lib/libcrypto/amd64/x86_64-gf2m.S
index 35d8512..5b8375c 100644
--- a/secure/lib/libcrypto/amd64/x86_64-gf2m.S
+++ b/secure/lib/libcrypto/amd64/x86_64-gf2m.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64-gf2m.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64-gf2m.pl. */
 .text	
 
 .type	_mul_1x1,@function
diff --git a/secure/lib/libcrypto/amd64/x86_64-mont.S b/secure/lib/libcrypto/amd64/x86_64-mont.S
index 9a83800..adbc962 100644
--- a/secure/lib/libcrypto/amd64/x86_64-mont.S
+++ b/secure/lib/libcrypto/amd64/x86_64-mont.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64-mont.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64-mont.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/x86_64-mont5.S b/secure/lib/libcrypto/amd64/x86_64-mont5.S
index 1724f9c0fb..7e8d43f 100644
--- a/secure/lib/libcrypto/amd64/x86_64-mont5.S
+++ b/secure/lib/libcrypto/amd64/x86_64-mont5.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64-mont5.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64-mont5.pl. */
 .text	
 
 
diff --git a/secure/lib/libcrypto/amd64/x86_64cpuid.S b/secure/lib/libcrypto/amd64/x86_64cpuid.S
index 5a2d4c6..52cafbd 100644
--- a/secure/lib/libcrypto/amd64/x86_64cpuid.S
+++ b/secure/lib/libcrypto/amd64/x86_64cpuid.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64cpuid.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64cpuid.pl. */
 
 .hidden	OPENSSL_cpuid_setup
 .section	.init