head	1.2;
access;
symbols
	perseant-exfatfs-base-20250801:1.2
	perseant-exfatfs-base-20240630:1.2
	perseant-exfatfs:1.2.0.36
	perseant-exfatfs-base:1.2
	cjep_sun2x:1.2.0.34
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	cjep_staticlib_x:1.2.0.32
	cjep_staticlib_x-base:1.2
	phil-wifi-20200421:1.2
	phil-wifi-20200411:1.2
	phil-wifi-20200406:1.2
	pgoyette-compat-merge-20190127:1.2
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.2
	pgoyette-compat-1126:1.2
	pgoyette-compat-1020:1.2
	pgoyette-compat-0930:1.2
	pgoyette-compat-0906:1.2
	pgoyette-compat-0728:1.2
	pgoyette-compat-0625:1.2
	pgoyette-compat-0521:1.2
	pgoyette-compat-0502:1.2
	pgoyette-compat-0422:1.2
	pgoyette-compat-0415:1.2
	pgoyette-compat-0407:1.2
	pgoyette-compat-0330:1.2
	pgoyette-compat-0322:1.2
	pgoyette-compat-0315:1.2
	pgoyette-compat:1.2.0.30
	pgoyette-compat-base:1.2
	perseant-stdc-iso10646:1.2.0.28
	perseant-stdc-iso10646-base:1.2
	prg-localcount2-base3:1.2
	prg-localcount2-base2:1.2
	prg-localcount2-base1:1.2
	prg-localcount2:1.2.0.26
	prg-localcount2-base:1.2
	pgoyette-localcount-20170426:1.2
	bouyer-socketcan-base1:1.2
	pgoyette-localcount-20170320:1.2
	bouyer-socketcan:1.2.0.24
	bouyer-socketcan-base:1.2
	pgoyette-localcount-20170107:1.2
	pgoyette-localcount-20161104:1.2
	localcount-20160914:1.2
	pgoyette-localcount-20160806:1.2
	pgoyette-localcount-20160726:1.2
	pgoyette-localcount:1.2.0.22
	pgoyette-localcount-base:1.2
	netbsd-5-2-3-RELEASE:1.2
	netbsd-5-1-5-RELEASE:1.2
	yamt-pagecache-base9:1.2
	yamt-pagecache-tag8:1.2
	tls-earlyentropy:1.2.0.18
	tls-earlyentropy-base:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base3:1.2
	netbsd-5-2-2-RELEASE:1.2
	netbsd-5-1-4-RELEASE:1.2
	netbsd-5-2-1-RELEASE:1.2
	netbsd-5-1-3-RELEASE:1.2
	agc-symver:1.2.0.20
	agc-symver-base:1.2
	tls-maxphys-base:1.2
	yamt-pagecache-base8:1.2
	netbsd-5-2:1.2.0.16
	yamt-pagecache-base7:1.2
	netbsd-5-2-RELEASE:1.2
	netbsd-5-2-RC1:1.2
	yamt-pagecache-base6:1.2
	yamt-pagecache-base5:1.2
	yamt-pagecache-base4:1.2
	netbsd-5-1-2-RELEASE:1.2
	netbsd-5-1-1-RELEASE:1.2
	yamt-pagecache-base3:1.2
	yamt-pagecache-base2:1.2
	yamt-pagecache:1.2.0.2
	yamt-pagecache-base:1.2
	bouyer-quota2-nbase:1.2
	bouyer-quota2:1.2.0.14
	bouyer-quota2-base:1.2
	matt-nb5-pq3:1.2.0.12
	matt-nb5-pq3-base:1.2
	netbsd-5-1:1.2.0.10
	netbsd-5-1-RELEASE:1.2
	netbsd-5-1-RC4:1.2
	netbsd-5-1-RC3:1.2
	netbsd-5-1-RC2:1.2
	netbsd-5-1-RC1:1.2
	netbsd-5-0-2-RELEASE:1.2
	netbsd-5-0-1-RELEASE:1.2
	jym-xensuspend-nbase:1.2
	netbsd-5-0:1.2.0.8
	netbsd-5-0-RELEASE:1.2
	netbsd-5-0-RC4:1.2
	netbsd-5-0-RC3:1.2
	netbsd-5-0-RC2:1.2
	jym-xensuspend:1.2.0.6
	jym-xensuspend-base:1.2
	netbsd-5-0-RC1:1.2
	netbsd-5:1.2.0.4
	netbsd-5-base:1.2
	matt-mips64:1.1.1.4.0.22
	netbsd-4-0-1-RELEASE:1.1.1.4
	wrstuden-fixsa-newbase:1.1.1.4
	yamt-pf42-base4:1.2
	yamt-pf42-base3:1.2
	hpcarm-cleanup-nbase:1.2
	yamt-pf42-base2:1.2
	wrstuden-revivesa:1.1.1.4.0.20
	yamt-pf42:1.1.1.4.0.18
	yamt-pf42-base:1.1.1.4
	keiichi-mipv6:1.1.1.4.0.16
	keiichi-mipv6-base:1.1.1.4
	matt-armv6-nbase:1.1.1.4
	matt-armv6-prevmlocking:1.1.1.4
	wrstuden-fixsa-base-1:1.1.1.4
	netbsd-4-0:1.1.1.4.0.14
	netbsd-4-0-RELEASE:1.1.1.4
	cube-autoconf:1.1.1.4.0.12
	cube-autoconf-base:1.1.1.4
	netbsd-4-0-RC5:1.1.1.4
	netbsd-4-0-RC4:1.1.1.4
	netbsd-4-0-RC3:1.1.1.4
	netbsd-4-0-RC2:1.1.1.4
	netbsd-4-0-RC1:1.1.1.4
	matt-armv6:1.1.1.4.0.10
	matt-armv6-base:1.1.1.4
	matt-mips64-base:1.1.1.4
	hpcarm-cleanup:1.1.1.4.0.8
	hpcarm-cleanup-base:1.1.1.4
	netbsd-3-1-1-RELEASE:1.1.1.2
	netbsd-3-0-3-RELEASE:1.1.1.2
	wrstuden-fixsa:1.1.1.4.0.6
	wrstuden-fixsa-base:1.1.1.4
	openssl_0_9_8e:1.1.1.4
	abandoned-netbsd-4-base:1.1.1.4
	abandoned-netbsd-4:1.1.1.4.0.2
	openssl_0_9_8d:1.1.1.4
	netbsd-3-1:1.1.1.2.0.12
	netbsd-3-1-RELEASE:1.1.1.2
	netbsd-3-0-2-RELEASE:1.1.1.2
	netbsd-3-1-RC4:1.1.1.2
	netbsd-3-1-RC3:1.1.1.2
	netbsd-3-1-RC2:1.1.1.2
	netbsd-3-1-RC1:1.1.1.2
	netbsd-4:1.1.1.4.0.4
	netbsd-4-base:1.1.1.4
	netbsd-3-0-1-RELEASE:1.1.1.2
	openssl_0_9_8b:1.1.1.4
	netbsd-3-0:1.1.1.2.0.10
	netbsd-3-0-RELEASE:1.1.1.2
	netbsd-3-0-RC6:1.1.1.2
	netbsd-3-0-RC5:1.1.1.2
	netbsd-3-0-RC4:1.1.1.2
	openssl_0_9_8a:1.1.1.4
	netbsd-3-0-RC3:1.1.1.2
	netbsd-3-0-RC2:1.1.1.2
	netbsd-3-0-RC1:1.1.1.2
	netbsd-2-0-3-RELEASE:1.1.1.2
	netbsd-2-1:1.1.1.2.0.8
	netbsd-2-1-RELEASE:1.1.1.2
	netbsd-2-1-RC6:1.1.1.2
	netbsd-2-1-RC5:1.1.1.2
	netbsd-2-1-RC4:1.1.1.2
	netbsd-2-1-RC3:1.1.1.2
	netbsd-2-1-RC2:1.1.1.2
	netbsd-2-1-RC1:1.1.1.2
	openssl_0_9_7g:1.1.1.3
	openssl_0_9_7f:1.1.1.3
	netbsd-2-0-2-RELEASE:1.1.1.2
	netbsd-3:1.1.1.2.0.6
	netbsd-3-base:1.1.1.2
	netbsd-2-0-1-RELEASE:1.1.1.2
	netbsd-2:1.1.1.2.0.4
	netbsd-2-base:1.1.1.2
	netbsd-2-0-RELEASE:1.1.1.2
	netbsd-2-0-RC5:1.1.1.2
	netbsd-2-0-RC4:1.1.1.2
	netbsd-2-0-RC3:1.1.1.2
	netbsd-2-0-RC2:1.1.1.2
	netbsd-2-0-RC1:1.1.1.2
	netbsd-2-0:1.1.1.2.0.2
	netbsd-2-0-base:1.1.1.2
	openssl_0_9_7d:1.1.1.2
	netbsd-1-6-PATCH002-RELEASE:1.1.1.1.6.1
	netbsd-1-6-PATCH002:1.1.1.1.6.1
	netbsd-1-6-PATCH002-RC4:1.1.1.1.6.1
	netbsd-1-6-PATCH002-RC3:1.1.1.1.6.1
	netbsd-1-6-PATCH002-RC2:1.1.1.1.6.1
	openssl_0_9_7c:1.1.1.2
	netbsd-1-6-PATCH002-RC1:1.1.1.1.6.1
	openssl_0_9_7b:1.1.1.2
	netbsd-1-6-PATCH001:1.1.1.1.6.1
	netbsd-1-6-PATCH001-RELEASE:1.1.1.1.6.1
	netbsd-1-6-PATCH001-RC3:1.1.1.1.6.1
	netbsd-1-6-PATCH001-RC2:1.1.1.1.6.1
	netbsd-1-6-PATCH001-RC1:1.1.1.1.6.1
	fvdl_fs64_base:1.1.1.2
	netbsd-1-6-RELEASE:1.1.1.1.6.1
	netbsd-1-6-RC3:1.1.1.1.6.1
	netbsd-1-6-RC2:1.1.1.1.6.1
	netbsd-1-6-RC1:1.1.1.1.6.1
	openssl_0_9_6g:1.1.1.2
	openssl_0_9_6f:1.1.1.2
	openssl_0_9_6e:1.1.1.2
	openssl_0_9_6d:1.1.1.1
	netbsd-1-6:1.1.1.1.0.6
	netbsd-1-6-base:1.1.1.1
	netbsd-1-5-PATCH003:1.1.1.1
	netbsd-1-5-PATCH002:1.1.1.1
	openssl_0_9_6b:1.1.1.1
	netbsd-1-5-PATCH001:1.1.1.1
	openssl_0_9_6a:1.1.1.1
	netbsd-1-5-RELEASE:1.1.1.1
	netbsd-1-5-BETA2:1.1.1.1
	netbsd-1-5-BETA:1.1.1.1
	netbsd-1-5-ALPHA2:1.1.1.1
	mrg-post-merge-openssl_0_9_5a:1.1.1.1
	openssl_0_9_5a:1.1.1.1
	minoura-xpg4dl:1.1.1.1.0.4
	minoura-xpg4dl-base:1.1.1.1
	netbsd-1-5:1.1.1.1.0.2
	netbsd-1-5-base:1.1.1.1
	openssl_0_9_4-netbsd-cryptosrc-intl:1.1.1.1
	OPENSSL:1.1.1;
locks; strict;
comment	@:: @;


1.2
date	2008.05.09.21.49.42;	author christos;	state dead;
branches;
next	1.1;

1.1
date	2000.06.14.22.44.24;	author thorpej;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.06.14.22.44.24;	author thorpej;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.4.1
	1.1.1.1.6.1;
next	1.1.1.2;

1.1.1.2
date	2002.07.31.00.09.24;	author itojun;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2005.03.25.19.10.54;	author christos;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2005.11.25.03.09.15;	author christos;	state Exp;
branches
	1.1.1.4.18.1
	1.1.1.4.20.1;
next	;

1.1.1.1.2.1
date	2002.08.29.16.43.01;	author he;	state Exp;
branches;
next	;

1.1.1.1.4.1
date	2000.06.14.22.44.24;	author thorpej;	state dead;
branches;
next	1.1.1.1.4.2;

1.1.1.1.4.2
date	2000.06.14.22.44.25;	author thorpej;	state Exp;
branches;
next	;

1.1.1.1.6.1
date	2002.08.02.12.04.23;	author lukem;	state Exp;
branches;
next	;

1.1.1.4.18.1
date	2008.06.17.14.55.22;	author yamt;	state dead;
branches;
next	;

1.1.1.4.20.1
date	2008.06.23.04.27.00;	author wrstuden;	state Exp;
branches;
next	1.1.1.4.20.2;

1.1.1.4.20.2
date	2008.06.23.04.52.45;	author wrstuden;	state dead;
branches;
next	;


desc
@@


1.2
log
@resolve conflicts
@
text
@@@echo off
echo Generating x86 for MASM assember

echo Bignum
cd crypto\bn\asm
perl x86.pl win32 > bn-win32.asm
cd ..\..\..

echo DES
cd crypto\des\asm
perl des-586.pl win32 > d-win32.asm
cd ..\..\..

echo "crypt(3)"

cd crypto\des\asm
perl crypt586.pl win32 > y-win32.asm
cd ..\..\..

echo Blowfish

cd crypto\bf\asm
perl bf-586.pl win32 > b-win32.asm
cd ..\..\..

echo CAST5
cd crypto\cast\asm
perl cast-586.pl win32 > c-win32.asm
cd ..\..\..

echo RC4
cd crypto\rc4\asm
perl rc4-586.pl win32 > r4-win32.asm
cd ..\..\..

echo MD5
cd crypto\md5\asm
perl md5-586.pl win32 > m5-win32.asm
cd ..\..\..

echo SHA1
cd crypto\sha\asm
perl sha1-586.pl win32 > s1-win32.asm
cd ..\..\..

echo RIPEMD160
cd crypto\ripemd\asm
perl rmd-586.pl win32 > rm-win32.asm
cd ..\..\..

echo RC5\32
cd crypto\rc5\asm
perl rc5-586.pl win32 > r5-win32.asm
cd ..\..\..

echo on

perl util\mkfiles.pl >MINFO
rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak
rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak
perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak
perl util\mk1mf.pl VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll VC-WIN32 >ms\ntdll.mak

perl util\mkdef.pl 16 libeay > ms\libeay16.def
perl util\mkdef.pl 32 libeay > ms\libeay32.def
perl util\mkdef.pl 16 ssleay > ms\ssleay16.def
perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import OpenSSL 0.9.4 from netbsd-cryptosrc-intl.
@
text
@@


1.1.1.1.4.1
log
@file do_masm.bat was added on branch minoura-xpg4dl on 2000-06-14 22:44:25 +0000
@
text
@d1 68
@


1.1.1.1.4.2
log
@Import OpenSSL 0.9.4 from netbsd-cryptosrc-intl.
@
text
@a0 68
@@echo off
echo Generating x86 for MASM assember

echo Bignum
cd crypto\bn\asm
perl x86.pl win32 > bn-win32.asm
cd ..\..\..

echo DES
cd crypto\des\asm
perl des-586.pl win32 > d-win32.asm
cd ..\..\..

echo "crypt(3)"

cd crypto\des\asm
perl crypt586.pl win32 > y-win32.asm
cd ..\..\..

echo Blowfish

cd crypto\bf\asm
perl bf-586.pl win32 > b-win32.asm
cd ..\..\..

echo CAST5
cd crypto\cast\asm
perl cast-586.pl win32 > c-win32.asm
cd ..\..\..

echo RC4
cd crypto\rc4\asm
perl rc4-586.pl win32 > r4-win32.asm
cd ..\..\..

echo MD5
cd crypto\md5\asm
perl md5-586.pl win32 > m5-win32.asm
cd ..\..\..

echo SHA1
cd crypto\sha\asm
perl sha1-586.pl win32 > s1-win32.asm
cd ..\..\..

echo RIPEMD160
cd crypto\ripemd\asm
perl rmd-586.pl win32 > rm-win32.asm
cd ..\..\..

echo RC5\32
cd crypto\rc5\asm
perl rc5-586.pl win32 > r5-win32.asm
cd ..\..\..

echo on

perl util\mkfiles.pl >MINFO
rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak
rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak
perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak
perl util\mk1mf.pl VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll VC-WIN32 >ms\ntdll.mak

perl util\mkdef.pl 16 libeay > ms\libeay16.def
perl util\mkdef.pl 32 libeay > ms\libeay32.def
perl util\mkdef.pl 16 ssleay > ms\ssleay16.def
perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
@


1.1.1.1.2.1
log
@Pull up revision 1.1.1.2 (requested by itojun,he):
  Update OpenSSL to version 0.9.6g.  Includes major version bump for
  libcrypto and all the dependent libraries.
@
text
@d6 1
a6 1
perl x86.pl win32 > bn_win32.asm
d11 1
a11 1
perl des-586.pl win32 > d_win32.asm
d17 1
a17 1
perl crypt586.pl win32 > y_win32.asm
d23 1
a23 1
perl bf-586.pl win32 > b_win32.asm
d28 1
a28 1
perl cast-586.pl win32 > c_win32.asm
d33 1
a33 1
perl rc4-586.pl win32 > r4_win32.asm
d38 1
a38 1
perl md5-586.pl win32 > m5_win32.asm
d43 1
a43 1
perl sha1-586.pl win32 > s1_win32.asm
d48 1
a48 1
perl rmd-586.pl win32 > rm_win32.asm
d53 1
a53 1
perl rc5-586.pl win32 > r5_win32.asm
@


1.1.1.1.6.1
log
@Pull up revision 1.1.1.2 (requested by itojun in ticket #607):
sync to head for openssl 0.9.6e
@
text
@d6 1
a6 1
perl x86.pl win32 > bn_win32.asm
d11 1
a11 1
perl des-586.pl win32 > d_win32.asm
d17 1
a17 1
perl crypt586.pl win32 > y_win32.asm
d23 1
a23 1
perl bf-586.pl win32 > b_win32.asm
d28 1
a28 1
perl cast-586.pl win32 > c_win32.asm
d33 1
a33 1
perl rc4-586.pl win32 > r4_win32.asm
d38 1
a38 1
perl md5-586.pl win32 > m5_win32.asm
d43 1
a43 1
perl sha1-586.pl win32 > s1_win32.asm
d48 1
a48 1
perl rmd-586.pl win32 > rm_win32.asm
d53 1
a53 1
perl rc5-586.pl win32 > r5_win32.asm
@


1.1.1.2
log
@OpenSSL 0.9.6e.  includes major security fixes (already applied)
@
text
@d6 1
a6 1
perl x86.pl win32 > bn_win32.asm
d11 1
a11 1
perl des-586.pl win32 > d_win32.asm
d17 1
a17 1
perl crypt586.pl win32 > y_win32.asm
d23 1
a23 1
perl bf-586.pl win32 > b_win32.asm
d28 1
a28 1
perl cast-586.pl win32 > c_win32.asm
d33 1
a33 1
perl rc4-586.pl win32 > r4_win32.asm
d38 1
a38 1
perl md5-586.pl win32 > m5_win32.asm
d43 1
a43 1
perl sha1-586.pl win32 > s1_win32.asm
d48 1
a48 1
perl rmd-586.pl win32 > rm_win32.asm
d53 1
a53 1
perl rc5-586.pl win32 > r5_win32.asm
@


1.1.1.3
log
@import openssl-0.9.7f from ftp.openssl.org
@
text
@a0 2
rem use "fips" as the first argument to make a proper FIPS build.

d59 10
a68 10
rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak
rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak
perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak

perl util\mkdef.pl 16 libeay %1 > ms\libeay16.def
perl util\mkdef.pl 32 libeay %1 > ms\libeay32.def
perl util\mkdef.pl 16 ssleay %1 > ms\ssleay16.def
perl util\mkdef.pl 32 ssleay %1 > ms\ssleay32.def
@


1.1.1.4
log
@from http://www.openssl.org/source
@
text
@d1 2
d61 10
a70 5
perl util\mk1mf.pl VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll VC-WIN32 >ms\ntdll.mak

perl util\mkdef.pl 32 libeay > ms\libeay32.def
perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
@


1.1.1.4.20.1
log
@Sync w/ -current. 34 merge conflicts to follow.
@
text
@d1 63
@


1.1.1.4.20.2
log
@Remove files removed on branch. Updating using patch has its
drawbacks. :-)
@
text
@@


1.1.1.4.18.1
log
@fix merge botches
@
text
@@