MFC: r304638, r304640

Fix white spaces and prefer C-style comments in assembly sources.

59 files changed, 126 insertions, 126 deletions

diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 2ddd796..a503920 100644
--- a/secure/lib/libcrypto/Makefile.asm
+++ b/secure/lib/libcrypto/Makefile.asm
@@ -64,8 +64,8 @@ CLEANFILES=	${ASM} ${SHA_ASM:S/$/.s/}
 .SUFFIXES:	.pl
 
 .pl.S:
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.IMPSRC:T}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	env CC=cc perl ${.IMPSRC} elf ) > ${.TARGET}
 
 ${SHA_TMP}: ${SHA_SRC}
@@ -73,8 +73,8 @@ ${SHA_TMP}: ${SHA_SRC}
 
 .for s in ${SHA_ASM}
 ${s}.S: ${s}.s
-	( echo '	# $$'FreeBSD'$$' ;\
-	echo '	# Do not modify. This file is auto-generated from ${SHA_SRC}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\
 	cat ${s}.s ) > ${.TARGET}
 .endfor
 
@@ -108,14 +108,14 @@ CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/}
 .SUFFIXES:	.pl
 
 aes-armv4.S:	aes-armv4.pl
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.ALLSRC:T}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
 	env CC=cc perl ${.ALLSRC} elf ) > ${.TARGET}
 
 .pl.S:
 	env CC=cc perl ${.IMPSRC} elf ${.TARGET:R:S/$/.s/}
-	( echo '	# $$'FreeBSD'$$' ;\
-	echo '	# Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\
 	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
 
 .elif defined(ASM_i386)
@@ -183,8 +183,8 @@ CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
 
 .pl.S:
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.IMPSRC:T}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	echo '#ifdef PIC' ;\
 	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ;\
 	echo '#else' ;\
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
diff --git a/secure/lib/libcrypto/arm/aes-armv4.S b/secure/lib/libcrypto/arm/aes-armv4.S
index 2a0f0e7..d499ac7 100644
--- a/secure/lib/libcrypto/arm/aes-armv4.S
+++ b/secure/lib/libcrypto/arm/aes-armv4.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aes-armv4.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aes-armv4.pl. */
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
diff --git a/secure/lib/libcrypto/arm/aesv8-armx.S b/secure/lib/libcrypto/arm/aesv8-armx.S
index ebd9eab..ebf629a 100644
--- a/secure/lib/libcrypto/arm/aesv8-armx.S
+++ b/secure/lib/libcrypto/arm/aesv8-armx.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from aesv8-armx.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesv8-armx.pl. */
 #include "arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
diff --git a/secure/lib/libcrypto/arm/armv4-gf2m.S b/secure/lib/libcrypto/arm/armv4-gf2m.S
index 7bbf180..b9f6477 100644
--- a/secure/lib/libcrypto/arm/armv4-gf2m.S
+++ b/secure/lib/libcrypto/arm/armv4-gf2m.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from armv4-gf2m.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from armv4-gf2m.pl. */
 #include "arm_arch.h"
 
 .text
diff --git a/secure/lib/libcrypto/arm/armv4-mont.S b/secure/lib/libcrypto/arm/armv4-mont.S
index 52ad567..ccb9370 100644
--- a/secure/lib/libcrypto/arm/armv4-mont.S
+++ b/secure/lib/libcrypto/arm/armv4-mont.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from armv4-mont.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from armv4-mont.pl. */
 #include "arm_arch.h"
 
 .text
diff --git a/secure/lib/libcrypto/arm/bsaes-armv7.S b/secure/lib/libcrypto/arm/bsaes-armv7.S
index 2325909..ae9fa05 100644
--- a/secure/lib/libcrypto/arm/bsaes-armv7.S
+++ b/secure/lib/libcrypto/arm/bsaes-armv7.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from bsaes-armv7.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bsaes-armv7.pl. */
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
diff --git a/secure/lib/libcrypto/arm/ghash-armv4.S b/secure/lib/libcrypto/arm/ghash-armv4.S
index f72bc87..200a76b 100644
--- a/secure/lib/libcrypto/arm/ghash-armv4.S
+++ b/secure/lib/libcrypto/arm/ghash-armv4.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from ghash-armv4.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghash-armv4.pl. */
 #include "arm_arch.h"
 
 .text
diff --git a/secure/lib/libcrypto/arm/ghashv8-armx.S b/secure/lib/libcrypto/arm/ghashv8-armx.S
index e066db6..264efb8 100644
--- a/secure/lib/libcrypto/arm/ghashv8-armx.S
+++ b/secure/lib/libcrypto/arm/ghashv8-armx.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from ghashv8-armx.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghashv8-armx.pl. */
 #include "arm_arch.h"
 
 .text
diff --git a/secure/lib/libcrypto/arm/sha1-armv4-large.S b/secure/lib/libcrypto/arm/sha1-armv4-large.S
index d7a4e77..e758613 100644
--- a/secure/lib/libcrypto/arm/sha1-armv4-large.S
+++ b/secure/lib/libcrypto/arm/sha1-armv4-large.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha1-armv4-large.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-armv4-large.pl. */
 #include "arm_arch.h"
 
 .text
diff --git a/secure/lib/libcrypto/arm/sha256-armv4.S b/secure/lib/libcrypto/arm/sha256-armv4.S
index 92b6c0f..c8f4a69 100644
--- a/secure/lib/libcrypto/arm/sha256-armv4.S
+++ b/secure/lib/libcrypto/arm/sha256-armv4.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha256-armv4.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha256-armv4.pl. */
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
diff --git a/secure/lib/libcrypto/arm/sha512-armv4.S b/secure/lib/libcrypto/arm/sha512-armv4.S
index ca5ba50..56f3fbc 100644
--- a/secure/lib/libcrypto/arm/sha512-armv4.S
+++ b/secure/lib/libcrypto/arm/sha512-armv4.S
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha512-armv4.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-armv4.pl. */
 #include "arm_arch.h"
 #ifdef __ARMEL__
 # define LO 0
diff --git a/secure/lib/libcrypto/i386/aes-586.S b/secure/lib/libcrypto/i386/aes-586.S
index 50265e4..bbf3147 100644
--- a/secure/lib/libcrypto/i386/aes-586.S
+++ b/secure/lib/libcrypto/i386/aes-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aes-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aes-586.pl. */
 #ifdef PIC
 .file	"aes-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/aesni-x86.S b/secure/lib/libcrypto/i386/aesni-x86.S
index 0badfda..26b6157 100644
--- a/secure/lib/libcrypto/i386/aesni-x86.S
+++ b/secure/lib/libcrypto/i386/aesni-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-x86.pl. */
 #ifdef PIC
 .file	"aesni-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/bf-586.S b/secure/lib/libcrypto/i386/bf-586.S
index 8e8ab9e..6cbbb6b 100644
--- a/secure/lib/libcrypto/i386/bf-586.S
+++ b/secure/lib/libcrypto/i386/bf-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bf-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bf-586.pl. */
 #ifdef PIC
 .file	"bf-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/bf-686.S b/secure/lib/libcrypto/i386/bf-686.S
index 7559b7b..c729e5f 100644
--- a/secure/lib/libcrypto/i386/bf-686.S
+++ b/secure/lib/libcrypto/i386/bf-686.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bf-686.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bf-686.pl. */
 #ifdef PIC
 .file	"bf-686.S"
 .text
diff --git a/secure/lib/libcrypto/i386/bn-586.S b/secure/lib/libcrypto/i386/bn-586.S
index b2de33f..1c742e9 100644
--- a/secure/lib/libcrypto/i386/bn-586.S
+++ b/secure/lib/libcrypto/i386/bn-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bn-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bn-586.pl. */
 #ifdef PIC
 .file	"bn-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/cmll-x86.S b/secure/lib/libcrypto/i386/cmll-x86.S
index eb05460..abb8842 100644
--- a/secure/lib/libcrypto/i386/cmll-x86.S
+++ b/secure/lib/libcrypto/i386/cmll-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from cmll-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from cmll-x86.pl. */
 #ifdef PIC
 .file	"cmll-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/co-586.S b/secure/lib/libcrypto/i386/co-586.S
index f2b331e..3623343 100644
--- a/secure/lib/libcrypto/i386/co-586.S
+++ b/secure/lib/libcrypto/i386/co-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from co-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from co-586.pl. */
 #ifdef PIC
 .file	"co-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/crypt586.S b/secure/lib/libcrypto/i386/crypt586.S
index ce021f3..0c9a706 100644
--- a/secure/lib/libcrypto/i386/crypt586.S
+++ b/secure/lib/libcrypto/i386/crypt586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from crypt586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from crypt586.pl. */
 #ifdef PIC
 .file	"crypt586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/des-586.S b/secure/lib/libcrypto/i386/des-586.S
index 137ed95..57fe540 100644
--- a/secure/lib/libcrypto/i386/des-586.S
+++ b/secure/lib/libcrypto/i386/des-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from des-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from des-586.pl. */
 #ifdef PIC
 .file	"des-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/ghash-x86.S b/secure/lib/libcrypto/i386/ghash-x86.S
index fd1e97d..8e42a83 100644
--- a/secure/lib/libcrypto/i386/ghash-x86.S
+++ b/secure/lib/libcrypto/i386/ghash-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ghash-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghash-x86.pl. */
 #ifdef PIC
 .file	"ghash-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/md5-586.S b/secure/lib/libcrypto/i386/md5-586.S
index 3440021..62069dd 100644
--- a/secure/lib/libcrypto/i386/md5-586.S
+++ b/secure/lib/libcrypto/i386/md5-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from md5-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from md5-586.pl. */
 #ifdef PIC
 .file	"md5-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/rc4-586.S b/secure/lib/libcrypto/i386/rc4-586.S
index 68158bc..0927f80 100644
--- a/secure/lib/libcrypto/i386/rc4-586.S
+++ b/secure/lib/libcrypto/i386/rc4-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-586.pl. */
 #ifdef PIC
 .file	"rc4-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/rc5-586.S b/secure/lib/libcrypto/i386/rc5-586.S
index f97deb8..6ec0d04 100644
--- a/secure/lib/libcrypto/i386/rc5-586.S
+++ b/secure/lib/libcrypto/i386/rc5-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc5-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc5-586.pl. */
 #ifdef PIC
 .file	"rc5-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/rmd-586.S b/secure/lib/libcrypto/i386/rmd-586.S
index 71e3157..4a0ef6d 100644
--- a/secure/lib/libcrypto/i386/rmd-586.S
+++ b/secure/lib/libcrypto/i386/rmd-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rmd-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rmd-586.pl. */
 #ifdef PIC
 .file	"rmd-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/sha1-586.S b/secure/lib/libcrypto/i386/sha1-586.S
index e35bbea..e36b6ad 100644
--- a/secure/lib/libcrypto/i386/sha1-586.S
+++ b/secure/lib/libcrypto/i386/sha1-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-586.pl. */
 #ifdef PIC
 .file	"sha1-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/sha256-586.S b/secure/lib/libcrypto/i386/sha256-586.S
index 36ca4f9..b188e95 100644
--- a/secure/lib/libcrypto/i386/sha256-586.S
+++ b/secure/lib/libcrypto/i386/sha256-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha256-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha256-586.pl. */
 #ifdef PIC
 .file	"sha256-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/sha512-586.S b/secure/lib/libcrypto/i386/sha512-586.S
index 67cd1b5..adba3a1 100644
--- a/secure/lib/libcrypto/i386/sha512-586.S
+++ b/secure/lib/libcrypto/i386/sha512-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha512-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-586.pl. */
 #ifdef PIC
 .file	"sha512-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/vpaes-x86.S b/secure/lib/libcrypto/i386/vpaes-x86.S
index 909d4db..25fe2ac 100644
--- a/secure/lib/libcrypto/i386/vpaes-x86.S
+++ b/secure/lib/libcrypto/i386/vpaes-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from vpaes-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from vpaes-x86.pl. */
 #ifdef PIC
 .file	"vpaes-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/wp-mmx.S b/secure/lib/libcrypto/i386/wp-mmx.S
index c02850a..85f73e9 100644
--- a/secure/lib/libcrypto/i386/wp-mmx.S
+++ b/secure/lib/libcrypto/i386/wp-mmx.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from wp-mmx.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from wp-mmx.pl. */
 #ifdef PIC
 .file	"wp-mmx.S"
 .text
diff --git a/secure/lib/libcrypto/i386/x86-gf2m.S b/secure/lib/libcrypto/i386/x86-gf2m.S
index bab2545..4ee3be2 100644
--- a/secure/lib/libcrypto/i386/x86-gf2m.S
+++ b/secure/lib/libcrypto/i386/x86-gf2m.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86-gf2m.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86-gf2m.pl. */
 #ifdef PIC
 .file	"x86-gf2m.S"
 .text
diff --git a/secure/lib/libcrypto/i386/x86-mont.S b/secure/lib/libcrypto/i386/x86-mont.S
index 67431fb..0988d8f 100644
--- a/secure/lib/libcrypto/i386/x86-mont.S
+++ b/secure/lib/libcrypto/i386/x86-mont.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86-mont.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86-mont.pl. */
 #ifdef PIC
 .file	"x86-mont.S"
 .text
diff --git a/secure/lib/libcrypto/i386/x86cpuid.S b/secure/lib/libcrypto/i386/x86cpuid.S
index 2023886..738f30c 100644
--- a/secure/lib/libcrypto/i386/x86cpuid.S
+++ b/secure/lib/libcrypto/i386/x86cpuid.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86cpuid.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86cpuid.pl. */
 #ifdef PIC
 .file	"x86cpuid.S"
 .text