convert to Unix EOL form

diff --git a/ms/bcb4.bat b/ms/bcb4.bat
index 71a670e79421378783ce30f51470007fb7a26b06..00fb9e8459ae571773d4eaa7811f2521b35051c7 100755 (executable)
--- a/ms/bcb4.bat
+++ b/ms/bcb4.bat
@@ -1,6 +1,6 @@
-perl Configure BC-32\r
-perl util\mkfiles.pl > MINFO\r
-\r
-@rem create make file\r
-perl util\mk1mf.pl no-asm BC-NT > bcb.mak\r
-\r
+perl Configure BC-32
+perl util\mkfiles.pl > MINFO
+
+@rem create make file
+perl util\mk1mf.pl no-asm BC-NT > bcb.mak
+

diff --git a/ms/do_nt.bat b/ms/do_nt.bat
index 9c06c27caacffdbeb0cdcb496b0195b6c9fc27e8..e2d525e05d8d0767f7ca953530abdcf76c68e2d1 100755 (executable)
--- a/ms/do_nt.bat
+++ b/ms/do_nt.bat
@@ -1,7 +1,7 @@
-\r
-perl util\mkfiles.pl >MINFO\r
-perl util\mk1mf.pl no-asm VC-NT >ms\nt.mak\r
-perl util\mk1mf.pl dll no-asm VC-NT >ms\ntdll.mak\r
-\r
-perl util\mkdef.pl libeay NT > ms\libeay32.def\r
-perl util\mkdef.pl ssleay NT > ms\ssleay32.def\r
+
+perl util\mkfiles.pl >MINFO
+perl util\mk1mf.pl no-asm VC-NT >ms\nt.mak
+perl util\mk1mf.pl dll no-asm VC-NT >ms\ntdll.mak
+
+perl util\mkdef.pl libeay NT > ms\libeay32.def
+perl util\mkdef.pl ssleay NT > ms\ssleay32.def

diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat
index 2a63f85c885ccd8a15c967035cf246d313a80bdb..42723f6a5815d486a4ba92b008b201970d7f4030 100755 (executable)
--- a/ms/do_win64a.bat
+++ b/ms/do_win64a.bat
@@ -1,19 +1,19 @@
-perl util\mkfiles.pl >MINFO\r
-\r
-cmd /c "nasm -f win64 -v" >NUL: 2>&1\r
-if %errorlevel% neq 0 goto ml64\r
-\r
-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm\r
-nasm -f win64 -o ms\uptable.obj ms\uptable.asm\r
-goto proceed\r
-\r
-:ml64\r
-perl ms\uplink-x86_64.pl masm > ms\uptable.asm\r
-ml64 -c -Foms\uptable.obj ms\uptable.asm\r
-\r
-:proceed\r
-perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak\r
-perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak\r
-\r
-perl util\mkdef.pl 32 libeay > ms\libeay32.def\r
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def\r
+perl util\mkfiles.pl >MINFO
+
+cmd /c "nasm -f win64 -v" >NUL: 2>&1
+if %errorlevel% neq 0 goto ml64
+
+perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
+nasm -f win64 -o ms\uptable.obj ms\uptable.asm
+goto proceed
+
+:ml64
+perl ms\uplink-x86_64.pl masm > ms\uptable.asm
+ml64 -c -Foms\uptable.obj ms\uptable.asm
+
+:proceed
+perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak
+perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak
+
+perl util\mkdef.pl 32 libeay > ms\libeay32.def
+perl util\mkdef.pl 32 ssleay > ms\ssleay32.def

diff --git a/ms/do_win64i.bat b/ms/do_win64i.bat
index 4e56eac92c7240214428ff7fd532038d961bea35..1aa3d281bac9409b4d8f7d32104a0bc087b9772d 100755 (executable)
--- a/ms/do_win64i.bat
+++ b/ms/do_win64i.bat
@@ -1,9 +1,9 @@
-\r
-perl util\mkfiles.pl >MINFO\r
-perl ms\uplink-ia64.pl > ms\uptable.asm\r
-ias -o ms\uptable.obj ms\uptable.asm\r
-perl util\mk1mf.pl no-asm VC-WIN64I >ms\nt.mak\r
-perl util\mk1mf.pl dll no-asm VC-WIN64I >ms\ntdll.mak\r
-\r
-perl util\mkdef.pl 32 libeay > ms\libeay32.def\r
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def\r
+
+perl util\mkfiles.pl >MINFO
+perl ms\uplink-ia64.pl > ms\uptable.asm
+ias -o ms\uptable.obj ms\uptable.asm
+perl util\mk1mf.pl no-asm VC-WIN64I >ms\nt.mak
+perl util\mk1mf.pl dll no-asm VC-WIN64I >ms\ntdll.mak
+
+perl util\mkdef.pl 32 libeay > ms\libeay32.def
+perl util\mkdef.pl 32 ssleay > ms\ssleay32.def

diff --git a/ms/mingw32.bat b/ms/mingw32.bat
index 7c26983035b252f5711e6dd747eeeff5da931a90..06b5733878c60da33638149f9e8c8cff3e87318b 100644 (file)
--- a/ms/mingw32.bat
+++ b/ms/mingw32.bat
@@ -1,90 +1,90 @@
-@rem OpenSSL with Mingw32+GNU as\r
-@rem ---------------------------\r
-\r
-perl Configure mingw %1 %2 %3 %4 %5 %6 %7 %8\r
-\r
-@echo off\r
-\r
-perl -e "exit 1 if '%1' eq 'no-asm'"\r
-if errorlevel 1 goto noasm\r
-\r
-echo Generating x86 for GNU assember\r
-\r
-echo Bignum\r
-cd crypto\bn\asm\r
-perl bn-586.pl gaswin > bn-win32.s\r
-perl co-586.pl gaswin > co-win32.s\r
-cd ..\..\..\r
-\r
-echo DES\r
-cd crypto\des\asm\r
-perl des-586.pl gaswin > d-win32.s\r
-cd ..\..\..\r
-\r
-echo crypt\r
-cd crypto\des\asm\r
-perl crypt586.pl gaswin > y-win32.s\r
-cd ..\..\..\r
-\r
-echo Blowfish\r
-cd crypto\bf\asm\r
-perl bf-586.pl gaswin > b-win32.s\r
-cd ..\..\..\r
-\r
-echo CAST5\r
-cd crypto\cast\asm\r
-perl cast-586.pl gaswin > c-win32.s\r
-cd ..\..\..\r
-\r
-echo RC4\r
-cd crypto\rc4\asm\r
-perl rc4-586.pl gaswin > r4-win32.s\r
-cd ..\..\..\r
-\r
-echo MD5\r
-cd crypto\md5\asm\r
-perl md5-586.pl gaswin > m5-win32.s\r
-cd ..\..\..\r
-\r
-echo SHA1\r
-cd crypto\sha\asm\r
-perl sha1-586.pl gaswin > s1-win32.s\r
-cd ..\..\..\r
-\r
-echo RIPEMD160\r
-cd crypto\ripemd\asm\r
-perl rmd-586.pl gaswin > rm-win32.s\r
-cd ..\..\..\r
-\r
-echo RC5\32\r
-cd crypto\rc5\asm\r
-perl rc5-586.pl gaswin > r5-win32.s\r
-cd ..\..\..\r
-\r
-:noasm\r
-\r
-echo Generating makefile\r
-perl util\mkfiles.pl >MINFO\r
-perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak\r
-echo Generating DLL definition files\r
-perl util\mkdef.pl 32 libeay >ms\libeay32.def\r
-if errorlevel 1 goto end\r
-perl util\mkdef.pl 32 ssleay >ms\ssleay32.def\r
-if errorlevel 1 goto end\r
-\r
-rem copy ms\tlhelp32.h outinc\r
-\r
-echo Building the libraries\r
-mingw32-make -f ms/mingw32a.mak\r
-if errorlevel 1 goto end\r
-\r
-echo Generating the DLLs and input libraries\r
-dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32\r
-if errorlevel 1 goto end\r
-dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a\r
-if errorlevel 1 goto end\r
-\r
-echo Done compiling OpenSSL\r
-\r
-:end\r
-\r
+@rem OpenSSL with Mingw32+GNU as
+@rem ---------------------------
+
+perl Configure mingw %1 %2 %3 %4 %5 %6 %7 %8
+
+@echo off
+
+perl -e "exit 1 if '%1' eq 'no-asm'"
+if errorlevel 1 goto noasm
+
+echo Generating x86 for GNU assember
+
+echo Bignum
+cd crypto\bn\asm
+perl bn-586.pl gaswin > bn-win32.s
+perl co-586.pl gaswin > co-win32.s
+cd ..\..\..
+
+echo DES
+cd crypto\des\asm
+perl des-586.pl gaswin > d-win32.s
+cd ..\..\..
+
+echo crypt
+cd crypto\des\asm
+perl crypt586.pl gaswin > y-win32.s
+cd ..\..\..
+
+echo Blowfish
+cd crypto\bf\asm
+perl bf-586.pl gaswin > b-win32.s
+cd ..\..\..
+
+echo CAST5
+cd crypto\cast\asm
+perl cast-586.pl gaswin > c-win32.s
+cd ..\..\..
+
+echo RC4
+cd crypto\rc4\asm
+perl rc4-586.pl gaswin > r4-win32.s
+cd ..\..\..
+
+echo MD5
+cd crypto\md5\asm
+perl md5-586.pl gaswin > m5-win32.s
+cd ..\..\..
+
+echo SHA1
+cd crypto\sha\asm
+perl sha1-586.pl gaswin > s1-win32.s
+cd ..\..\..
+
+echo RIPEMD160
+cd crypto\ripemd\asm
+perl rmd-586.pl gaswin > rm-win32.s
+cd ..\..\..
+
+echo RC5\32
+cd crypto\rc5\asm
+perl rc5-586.pl gaswin > r5-win32.s
+cd ..\..\..
+
+:noasm
+
+echo Generating makefile
+perl util\mkfiles.pl >MINFO
+perl util\mk1mf.pl gaswin Mingw32 >ms\mingw32a.mak
+echo Generating DLL definition files
+perl util\mkdef.pl 32 libeay >ms\libeay32.def
+if errorlevel 1 goto end
+perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
+if errorlevel 1 goto end
+
+rem copy ms\tlhelp32.h outinc
+
+echo Building the libraries
+mingw32-make -f ms/mingw32a.mak
+if errorlevel 1 goto end
+
+echo Generating the DLLs and input libraries
+dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32
+if errorlevel 1 goto end
+dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+if errorlevel 1 goto end
+
+echo Done compiling OpenSSL
+
+:end
+

diff --git a/ms/mw.bat b/ms/mw.bat
index 64a21b8ebb69e37ff2705cd6801e63054800bf64..35e00a4508210009f758b7337b5336adbd7de722 100644 (file)
--- a/ms/mw.bat
+++ b/ms/mw.bat
@@ -1,26 +1,26 @@
-@rem OpenSSL with Mingw32\r
-@rem --------------------\r
-\r
-@rem Makefile\r
-perl util\mkfiles.pl >MINFO\r
-perl util\mk1mf.pl Mingw32 >ms\mingw32.mak\r
-@rem DLL definition files\r
-perl util\mkdef.pl 32 libeay >ms\libeay32.def\r
-if errorlevel 1 goto end\r
-perl util\mkdef.pl 32 ssleay >ms\ssleay32.def\r
-if errorlevel 1 goto end\r
-\r
-@rem Build the libraries\r
-make -f ms/mingw32.mak\r
-if errorlevel 1 goto end\r
-\r
-@rem Generate the DLLs and input libraries\r
-dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32\r
-if errorlevel 1 goto end\r
-dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a\r
-if errorlevel 1 goto end\r
-\r
-echo Done compiling OpenSSL\r
-\r
-:end\r
-\r
+@rem OpenSSL with Mingw32
+@rem --------------------
+
+@rem Makefile
+perl util\mkfiles.pl >MINFO
+perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
+@rem DLL definition files
+perl util\mkdef.pl 32 libeay >ms\libeay32.def
+if errorlevel 1 goto end
+perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
+if errorlevel 1 goto end
+
+@rem Build the libraries
+make -f ms/mingw32.mak
+if errorlevel 1 goto end
+
+@rem Generate the DLLs and input libraries
+dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32
+if errorlevel 1 goto end
+dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+if errorlevel 1 goto end
+
+echo Done compiling OpenSSL
+
+:end
+

diff --git a/ms/tenc.bat b/ms/tenc.bat
index 466fdfccbfb94a57a201e489dcf8e32e8e0c9004..a4fa7f3652c4fa07c9aed936646592a5b1b90a7f 100755 (executable)
--- a/ms/tenc.bat
+++ b/ms/tenc.bat
@@ -1,14 +1,14 @@
-rem called by testenc\r
-\r
-echo test %1 %2 %3 %4 %5 %6 \r
-%ssleay% %1 %2 %3 %4 %5 %6 -e -bufsize 113 -k test -in %input% -out %tmp1%\r
-%ssleay% %1 %2 %3 %4 %5 %6 -d -bufsize 157 -k test -in %tmp1% -out %out1%\r
-%cmp% %input% %out1%\r
-if errorlevel 1 goto err\r
-\r
-echo test base64 %1 %2 %3 %4 %5 %6 \r
-%ssleay% %1 %2 %3 %4 %5 %6 -a -e -bufsize 113 -k test -in %input% -out %tmp1%\r
-%ssleay% %1 %2 %3 %4 %5 %6 -a -d -bufsize 157 -k test -in %tmp1% -out %out1%\r
-%cmp% %input% %out1%\r
-\r
-:err\r
+rem called by testenc
+
+echo test %1 %2 %3 %4 %5 %6 
+%ssleay% %1 %2 %3 %4 %5 %6 -e -bufsize 113 -k test -in %input% -out %tmp1%
+%ssleay% %1 %2 %3 %4 %5 %6 -d -bufsize 157 -k test -in %tmp1% -out %out1%
+%cmp% %input% %out1%
+if errorlevel 1 goto err
+
+echo test base64 %1 %2 %3 %4 %5 %6 
+%ssleay% %1 %2 %3 %4 %5 %6 -a -e -bufsize 113 -k test -in %input% -out %tmp1%
+%ssleay% %1 %2 %3 %4 %5 %6 -a -d -bufsize 157 -k test -in %tmp1% -out %out1%
+%cmp% %input% %out1%
+
+:err

diff --git a/ms/tencce.bat b/ms/tencce.bat
index 6a944d7671eae1f471ce9ec6f807e5548905923e..c8b1acd4b44cc12f0ae745bca7c9397dcb9bf2d2 100644 (file)
--- a/ms/tencce.bat
+++ b/ms/tencce.bat
@@ -1,19 +1,19 @@
-rem called by testencce\r
-\r
-echo test %1 %2 %3 %4 %5 %6 \r
-cecopy %input% CE:\OpenSSL\r
-cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -e -bufsize 113 -k test -in \OpenSSL\%input% -out \OpenSSL\%tmp1%\r
-cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -d -bufsize 157 -k test -in \OpenSSL\%tmp1% -out \OpenSSL\%out1%\r
-del %out1% >nul 2>&1\r
-cecopy CE:\OpenSSL\%out1% .\r
-%cmp% %input% %out1%\r
-if errorlevel 1 goto err\r
-\r
-echo test base64 %1 %2 %3 %4 %5 %6 \r
-cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -a -e -bufsize 113 -k test -in \OpenSSL\%input% -out \OpenSSL\%tmp1%\r
-cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -a -d -bufsize 157 -k test -in \OpenSSL\%tmp1% -out \OpenSSL\%out1%\r
-del %out1% >nul 2>&1\r
-cecopy CE:\OpenSSL\%out1% .\r
-%cmp% %input% %out1%\r
-\r
-:err\r
+rem called by testencce
+
+echo test %1 %2 %3 %4 %5 %6 
+cecopy %input% CE:\OpenSSL
+cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -e -bufsize 113 -k test -in \OpenSSL\%input% -out \OpenSSL\%tmp1%
+cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -d -bufsize 157 -k test -in \OpenSSL\%tmp1% -out \OpenSSL\%out1%
+del %out1% >nul 2>&1
+cecopy CE:\OpenSSL\%out1% .
+%cmp% %input% %out1%
+if errorlevel 1 goto err
+
+echo test base64 %1 %2 %3 %4 %5 %6 
+cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -a -e -bufsize 113 -k test -in \OpenSSL\%input% -out \OpenSSL\%tmp1%
+cerun CE:\OpenSSL\%ssleay% %1 %2 %3 %4 %5 %6 -a -d -bufsize 157 -k test -in \OpenSSL\%tmp1% -out \OpenSSL\%out1%
+del %out1% >nul 2>&1
+cecopy CE:\OpenSSL\%out1% .
+%cmp% %input% %out1%
+
+:err

diff --git a/ms/testenc.bat b/ms/testenc.bat
index 4b99bd5895e3316dc36b78bd17bfa707da7d17b4..f8e90939ed3c5aa8151c43b80b337bb64e0b42dd 100755 (executable)
--- a/ms/testenc.bat
+++ b/ms/testenc.bat
@@ -1,94 +1,94 @@
-@echo off\r
-echo start testenc\r
-\r
-path=..\ms;%path%\r
-set ssleay=%1%\r
-set input=..\ms\testenc.bat\r
-set tmp1=..\ms\cipher.out\r
-set out1=..\ms\clear.out\r
-set cmp=perl ..\ms\cmp.pl\r
-\r
-cd\r
-call tenc.bat enc\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat rc4\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede3-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede3-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede3\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat des-ede3-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat idea-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat idea-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat idea-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat idea-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat rc2-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat rc2-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat rc2-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat rc2-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat bf-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat bf-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat bf-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tenc.bat bf-cbc\r
-if errorlevel 1 goto err\r
-\r
-echo OK\r
-del %out1%\r
-del %tmp1%\r
-:err\r
-\r
+@echo off
+echo start testenc
+
+path=..\ms;%path%
+set ssleay=%1%
+set input=..\ms\testenc.bat
+set tmp1=..\ms\cipher.out
+set out1=..\ms\clear.out
+set cmp=perl ..\ms\cmp.pl
+
+cd
+call tenc.bat enc
+if errorlevel 1 goto err
+
+call tenc.bat rc4
+if errorlevel 1 goto err
+
+call tenc.bat des-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-cfb
+if errorlevel 1 goto err
+
+call tenc.bat des-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-ofb
+if errorlevel 1 goto err
+
+call tenc.bat des-ecb
+if errorlevel 1 goto err
+
+call tenc.bat des-ede
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3
+if errorlevel 1 goto err
+
+call tenc.bat des-cbc
+if errorlevel 1 goto err
+
+call tenc.bat des-ede-cbc
+if errorlevel 1 goto err
+
+call tenc.bat des-ede3-cbc
+if errorlevel 1 goto err
+
+call tenc.bat idea-ecb
+if errorlevel 1 goto err
+
+call tenc.bat idea-cfb
+if errorlevel 1 goto err
+
+call tenc.bat idea-ofb
+if errorlevel 1 goto err
+
+call tenc.bat idea-cbc
+if errorlevel 1 goto err
+
+call tenc.bat rc2-ecb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-cfb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-ofb
+if errorlevel 1 goto err
+
+call tenc.bat rc2-cbc
+if errorlevel 1 goto err
+
+call tenc.bat bf-ecb
+if errorlevel 1 goto err
+
+call tenc.bat bf-cfb
+if errorlevel 1 goto err
+
+call tenc.bat bf-ofb
+if errorlevel 1 goto err
+
+call tenc.bat bf-cbc
+if errorlevel 1 goto err
+
+echo OK
+del %out1%
+del %tmp1%
+:err
+

diff --git a/ms/testencce.bat b/ms/testencce.bat
index 04faa5d99b68d74d172856be732dc0f492f1182e..1da3e0861f27a5b672b73ae3581a0125279da4a3 100644 (file)
--- a/ms/testencce.bat
+++ b/ms/testencce.bat
@@ -1,97 +1,97 @@
-@echo off\r
-echo start testenc\r
-\r
-path=..\ms;%path%\r
-set ssleay=%1%\r
-copy ..\ms\testenc.bat >nul\r
-set input=testenc.bat\r
-set tmp1=cipher.out\r
-set out1=clear.out\r
-set cmp=perl ..\ms\cmp.pl\r
-\r
-cecopy %ssleay% CE:\OpenSSL\r
-\r
-cd\r
-call tencce.bat enc\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat rc4\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede3-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede3-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede3\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat des-ede3-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat idea-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat idea-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat idea-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat idea-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat rc2-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat rc2-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat rc2-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat rc2-cbc\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat bf-ecb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat bf-cfb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat bf-ofb\r
-if errorlevel 1 goto err\r
-\r
-call tencce.bat bf-cbc\r
-if errorlevel 1 goto err\r
-\r
-echo OK\r
-del %out1% >nul 2>&1\r
-del %tmp1% >nul 2>&1\r
-:err\r
-\r
+@echo off
+echo start testenc
+
+path=..\ms;%path%
+set ssleay=%1%
+copy ..\ms\testenc.bat >nul
+set input=testenc.bat
+set tmp1=cipher.out
+set out1=clear.out
+set cmp=perl ..\ms\cmp.pl
+
+cecopy %ssleay% CE:\OpenSSL
+
+cd
+call tencce.bat enc
+if errorlevel 1 goto err
+
+call tencce.bat rc4
+if errorlevel 1 goto err
+
+call tencce.bat des-cfb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede-cfb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3-cfb
+if errorlevel 1 goto err
+
+call tencce.bat des-ofb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede-ofb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3-ofb
+if errorlevel 1 goto err
+
+call tencce.bat des-ecb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3
+if errorlevel 1 goto err
+
+call tencce.bat des-cbc
+if errorlevel 1 goto err
+
+call tencce.bat des-ede-cbc
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3-cbc
+if errorlevel 1 goto err
+
+call tencce.bat idea-ecb
+if errorlevel 1 goto err
+
+call tencce.bat idea-cfb
+if errorlevel 1 goto err
+
+call tencce.bat idea-ofb
+if errorlevel 1 goto err
+
+call tencce.bat idea-cbc
+if errorlevel 1 goto err
+
+call tencce.bat rc2-ecb
+if errorlevel 1 goto err
+
+call tencce.bat rc2-cfb
+if errorlevel 1 goto err
+
+call tencce.bat rc2-ofb
+if errorlevel 1 goto err
+
+call tencce.bat rc2-cbc
+if errorlevel 1 goto err
+
+call tencce.bat bf-ecb
+if errorlevel 1 goto err
+
+call tencce.bat bf-cfb
+if errorlevel 1 goto err
+
+call tencce.bat bf-ofb
+if errorlevel 1 goto err
+
+call tencce.bat bf-cbc
+if errorlevel 1 goto err
+
+echo OK
+del %out1% >nul 2>&1
+del %tmp1% >nul 2>&1
+:err
+

diff --git a/ms/testpem.bat b/ms/testpem.bat
index 005f13b67e54a29f6bab29555401542660dc56cf..8b2e844d369fb9b8dd7b3264db6e8dbb71edaa51 100755 (executable)
--- a/ms/testpem.bat
+++ b/ms/testpem.bat
@@ -1,32 +1,32 @@
-@echo off\r
-set ssleay=%1%\r
-set tmp1=pem.out\r
-set cmp=fc.exe\r
-\r
-call tpem.bat crl ..\test\testcrl.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat pkcs7 ..\test\testp7.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat req ..\test\testreq2.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat rsa ..\test\testrsa.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat x509 ..\test\testx509.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat x509 ..\test\v3-cert1.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat x509 ..\test\v3-cert1.pem\r
-if errorlevel 1 goto err\r
-\r
-call tpem.bat sess_id ..\test\testsid.pem\r
-if errorlevel 1 goto err\r
-\r
-echo OK\r
-del %tmp1%\r
-:err\r
+@echo off
+set ssleay=%1%
+set tmp1=pem.out
+set cmp=fc.exe
+
+call tpem.bat crl ..\test\testcrl.pem
+if errorlevel 1 goto err
+
+call tpem.bat pkcs7 ..\test\testp7.pem
+if errorlevel 1 goto err
+
+call tpem.bat req ..\test\testreq2.pem
+if errorlevel 1 goto err
+
+call tpem.bat rsa ..\test\testrsa.pem
+if errorlevel 1 goto err
+
+call tpem.bat x509 ..\test\testx509.pem
+if errorlevel 1 goto err
+
+call tpem.bat x509 ..\test\v3-cert1.pem
+if errorlevel 1 goto err
+
+call tpem.bat x509 ..\test\v3-cert1.pem
+if errorlevel 1 goto err
+
+call tpem.bat sess_id ..\test\testsid.pem
+if errorlevel 1 goto err
+
+echo OK
+del %tmp1%
+:err

diff --git a/ms/testpemce.bat b/ms/testpemce.bat
index c793c3e5143725c3752ab411eb99f6fad610ed55..ac64a7912ceadcad872cfa378978fb0064458d6b 100644 (file)
--- a/ms/testpemce.bat
+++ b/ms/testpemce.bat
@@ -1,42 +1,42 @@
-@echo off\r
-set ssleay=%1%\r
-set tmp1=pem.out\r
-set cmp=fc.exe\r
-\r
-cecopy %ssleay% CE:\OpenSSL\r
-\r
-copy ..\test\testcrl.pem >nul\r
-call tpemce.bat crl testcrl.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\testp7.pem >nul\r
-call tpemce.bat pkcs7 testp7.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\testreq2.pem >nul\r
-call tpemce.bat req testreq2.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\testrsa.pem >nul\r
-call tpemce.bat rsa testrsa.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\testx509.pem >nul\r
-call tpemce.bat x509 testx509.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\v3-cert1.pem >nul\r
-call tpemce.bat x509 v3-cert1.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\v3-cert1.pem >nul\r
-call tpemce.bat x509 v3-cert1.pem\r
-if errorlevel 1 goto err\r
-\r
-copy ..\test\testsid.pem >nul\r
-call tpemce.bat sess_id testsid.pem\r
-if errorlevel 1 goto err\r
-\r
-echo OK\r
-del %tmp1% >nul 2>&1\r
-:err\r
+@echo off
+set ssleay=%1%
+set tmp1=pem.out
+set cmp=fc.exe
+
+cecopy %ssleay% CE:\OpenSSL
+
+copy ..\test\testcrl.pem >nul
+call tpemce.bat crl testcrl.pem
+if errorlevel 1 goto err
+
+copy ..\test\testp7.pem >nul
+call tpemce.bat pkcs7 testp7.pem
+if errorlevel 1 goto err
+
+copy ..\test\testreq2.pem >nul
+call tpemce.bat req testreq2.pem
+if errorlevel 1 goto err
+
+copy ..\test\testrsa.pem >nul
+call tpemce.bat rsa testrsa.pem
+if errorlevel 1 goto err
+
+copy ..\test\testx509.pem >nul
+call tpemce.bat x509 testx509.pem
+if errorlevel 1 goto err
+
+copy ..\test\v3-cert1.pem >nul
+call tpemce.bat x509 v3-cert1.pem
+if errorlevel 1 goto err
+
+copy ..\test\v3-cert1.pem >nul
+call tpemce.bat x509 v3-cert1.pem
+if errorlevel 1 goto err
+
+copy ..\test\testsid.pem >nul
+call tpemce.bat sess_id testsid.pem
+if errorlevel 1 goto err
+
+echo OK
+del %tmp1% >nul 2>&1
+:err

diff --git a/ms/testss.bat b/ms/testss.bat
index b4aaf3c601d6a3227833c53d0c7f062d8a018a9c..5afa131dba2e504c082b57a5d66198da833e824e 100755 (executable)
--- a/ms/testss.bat
+++ b/ms/testss.bat
@@ -1,98 +1,98 @@
-@echo off\r
-\r
-rem set ssleay=..\out\ssleay\r
-set ssleay=%1\r
-\r
-set reqcmd=%ssleay% req\r
-set x509cmd=%ssleay% x509 -sha1\r
-set verifycmd=%ssleay% verify\r
-\r
-set CAkey=keyCA.ss\r
-set CAcert=certCA.ss\r
-set CAserial=certCA.srl\r
-set CAreq=reqCA.ss\r
-set CAconf=..\test\CAss.cnf\r
-set CAreq2=req2CA.ss   \r
-\r
-set Uconf=..\test\Uss.cnf\r
-set Ukey=keyU.ss\r
-set Ureq=reqU.ss\r
-set Ucert=certU.ss\r
-\r
-echo make a certificate request using 'req'\r
-%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new\r
-if errorlevel 1 goto e_req\r
-\r
-echo convert the certificate request into a self signed certificate using 'x509'\r
-%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% >err.ss\r
-if errorlevel 1 goto e_x509\r
-\r
-echo --\r
-echo convert a certificate into a certificate request using 'x509'\r
-%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% >err.ss\r
-if errorlevel 1 goto e_x509_2\r
-\r
-%reqcmd% -verify -in %CAreq% -noout\r
-if errorlevel 1 goto e_vrfy_1\r
-\r
-%reqcmd% -verify -in %CAreq2% -noout\r
-if errorlevel 1 goto e_vrfy_2\r
-\r
-%verifycmd% -CAfile %CAcert% %CAcert%\r
-if errorlevel 1 goto e_vrfy_3\r
-\r
-echo --\r
-echo make another certificate request using 'req'\r
-%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new >err.ss\r
-if errorlevel 1 goto e_req_gen\r
-\r
-echo --\r
-echo sign certificate request with the just created CA via 'x509'\r
-%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial%\r
-if errorlevel 1 goto e_x_sign\r
-\r
-%verifycmd% -CAfile %CAcert% %Ucert%\r
-echo --\r
-echo Certificate details\r
-%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert%\r
-\r
-echo Everything appeared to work\r
-echo --\r
-echo The generated CA certificate is %CAcert%\r
-echo The generated CA private key is %CAkey%\r
-echo The current CA signing serial number is in %CAserial%\r
-\r
-echo The generated user certificate is %Ucert%\r
-echo The generated user private key is %Ukey%\r
-echo --\r
-\r
-del err.ss\r
-\r
-goto end\r
-\r
-:e_req\r
-echo error using 'req' to generate a certificate request\r
-goto end\r
-:e_x509\r
-echo error using 'x509' to self sign a certificate request\r
-goto end\r
-:e_x509_2\r
-echo error using 'x509' convert a certificate to a certificate request\r
-goto end\r
-:e_vrfy_1\r
-echo first generated request is invalid\r
-goto end\r
-:e_vrfy_2\r
-echo second generated request is invalid\r
-goto end\r
-:e_vrfy_3\r
-echo first generated cert is invalid\r
-goto end\r
-:e_req_gen\r
-echo error using 'req' to generate a certificate request\r
-goto end\r
-:e_x_sign\r
-echo error using 'x509' to sign a certificate request\r
-goto end\r
-\r
-:end\r
+@echo off
+
+rem set ssleay=..\out\ssleay
+set ssleay=%1
+
+set reqcmd=%ssleay% req
+set x509cmd=%ssleay% x509 -sha1
+set verifycmd=%ssleay% verify
+
+set CAkey=keyCA.ss
+set CAcert=certCA.ss
+set CAserial=certCA.srl
+set CAreq=reqCA.ss
+set CAconf=..\test\CAss.cnf
+set CAreq2=req2CA.ss   
+
+set Uconf=..\test\Uss.cnf
+set Ukey=keyU.ss
+set Ureq=reqU.ss
+set Ucert=certU.ss
+
+echo make a certificate request using 'req'
+%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new
+if errorlevel 1 goto e_req
+
+echo convert the certificate request into a self signed certificate using 'x509'
+%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% >err.ss
+if errorlevel 1 goto e_x509
+
+echo --
+echo convert a certificate into a certificate request using 'x509'
+%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% >err.ss
+if errorlevel 1 goto e_x509_2
+
+%reqcmd% -verify -in %CAreq% -noout
+if errorlevel 1 goto e_vrfy_1
+
+%reqcmd% -verify -in %CAreq2% -noout
+if errorlevel 1 goto e_vrfy_2
+
+%verifycmd% -CAfile %CAcert% %CAcert%
+if errorlevel 1 goto e_vrfy_3
+
+echo --
+echo make another certificate request using 'req'
+%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new >err.ss
+if errorlevel 1 goto e_req_gen
+
+echo --
+echo sign certificate request with the just created CA via 'x509'
+%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial%
+if errorlevel 1 goto e_x_sign
+
+%verifycmd% -CAfile %CAcert% %Ucert%
+echo --
+echo Certificate details
+%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert%
+
+echo Everything appeared to work
+echo --
+echo The generated CA certificate is %CAcert%
+echo The generated CA private key is %CAkey%
+echo The current CA signing serial number is in %CAserial%
+
+echo The generated user certificate is %Ucert%
+echo The generated user private key is %Ukey%
+echo --
+
+del err.ss
+
+goto end
+
+:e_req
+echo error using 'req' to generate a certificate request
+goto end
+:e_x509
+echo error using 'x509' to self sign a certificate request
+goto end
+:e_x509_2
+echo error using 'x509' convert a certificate to a certificate request
+goto end
+:e_vrfy_1
+echo first generated request is invalid
+goto end
+:e_vrfy_2
+echo second generated request is invalid
+goto end
+:e_vrfy_3
+echo first generated cert is invalid
+goto end
+:e_req_gen
+echo error using 'req' to generate a certificate request
+goto end
+:e_x_sign
+echo error using 'x509' to sign a certificate request
+goto end
+
+:end

diff --git a/ms/testssce.bat b/ms/testssce.bat
index dbb25abdb0559f6cefa2bcffe3107aad33d1d99a..18381ed2faff4ab928620ad321232b87568bb8ae 100644 (file)
--- a/ms/testssce.bat
+++ b/ms/testssce.bat
@@ -1,104 +1,104 @@
-rem set ssleay=..\out\ssleay\r
-set ssleay=%1\r
-\r
-set reqcmd=%ssleay% req\r
-set x509cmd=%ssleay% x509\r
-set verifycmd=%ssleay% verify\r
-\r
-set CAkey=\OpenSSL\keyCA.ss\r
-set CAcert=\OpenSSL\certCA.ss\r
-set CAserial=\OpenSSL\certCA.srl\r
-set CAreq=\OpenSSL\reqCA.ss\r
-cecopy ..\test\CAss.cnf CE:\OpenSSL\r
-set CAconf=\OpenSSL\CAss.cnf\r
-set CAreq2=\OpenSSL\req2CA.ss  \r
-\r
-cecopy ..\test\Uss.cnf CE:\OpenSSL\r
-set Uconf=\OpenSSL\Uss.cnf\r
-set Ukey=\OpenSSL\keyU.ss\r
-set Ureq=\OpenSSL\reqU.ss\r
-set Ucert=\OpenSSL\certU.ss\r
-\r
-echo make a certificate request using 'req'\r
-cerun CE:\OpenSSL\%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new\r
-if errorlevel 1 goto e_req\r
-\r
-echo convert the certificate request into a self signed certificate using 'x509'\r
-cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% "> \OpenSSL\err.ss"\r
-if errorlevel 1 goto e_x509\r
-\r
-echo --\r
-echo convert a certificate into a certificate request using 'x509'\r
-cerun CE:\OpenSSL\%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% "> \OpenSSL\err.ss"\r
-if errorlevel 1 goto e_x509_2\r
-\r
-cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq% -noout\r
-if errorlevel 1 goto e_vrfy_1\r
-\r
-cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq2% -noout\r
-if errorlevel 1 goto e_vrfy_2\r
-\r
-cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %CAcert%\r
-if errorlevel 1 goto e_vrfy_3\r
-\r
-echo --\r
-echo make another certificate request using 'req'\r
-cerun CE:\OpenSSL\%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new "> \OpenSSL\err.ss"\r
-if errorlevel 1 goto e_req_gen\r
-\r
-echo --\r
-echo sign certificate request with the just created CA via 'x509'\r
-cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial%\r
-if errorlevel 1 goto e_x_sign\r
-\r
-cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %Ucert%\r
-echo --\r
-echo Certificate details\r
-cerun CE:\OpenSSL\%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert%\r
-\r
-cecopy CE:%CAcert% .\r
-cecopy CE:%CAkey% .\r
-cecopy CE:%CAserial% .\r
-cecopy CE:%Ucert% .\r
-cecopy CE:%Ukey% .\r
-\r
-echo Everything appeared to work\r
-echo --\r
-echo The generated CA certificate is %CAcert%\r
-echo The generated CA private key is %CAkey%\r
-echo The current CA signing serial number is in %CAserial%\r
-\r
-echo The generated user certificate is %Ucert%\r
-echo The generated user private key is %Ukey%\r
-echo --\r
-\r
-cedel CE:\OpenSSL\err.ss\r
-\r
-goto end\r
-\r
-:e_req\r
-echo error using 'req' to generate a certificate request\r
-goto end\r
-:e_x509\r
-echo error using 'x509' to self sign a certificate request\r
-goto end\r
-:e_x509_2\r
-echo error using 'x509' convert a certificate to a certificate request\r
-goto end\r
-:e_vrfy_1\r
-echo first generated request is invalid\r
-goto end\r
-:e_vrfy_2\r
-echo second generated request is invalid\r
-goto end\r
-:e_vrfy_3\r
-echo first generated cert is invalid\r
-goto end\r
-:e_req_gen\r
-echo error using 'req' to generate a certificate request\r
-goto end\r
-:e_x_sign\r
-echo error using 'x509' to sign a certificate request\r
-goto end\r
-\r
-:end\r
+rem set ssleay=..\out\ssleay
+set ssleay=%1
+
+set reqcmd=%ssleay% req
+set x509cmd=%ssleay% x509
+set verifycmd=%ssleay% verify
+
+set CAkey=\OpenSSL\keyCA.ss
+set CAcert=\OpenSSL\certCA.ss
+set CAserial=\OpenSSL\certCA.srl
+set CAreq=\OpenSSL\reqCA.ss
+cecopy ..\test\CAss.cnf CE:\OpenSSL
+set CAconf=\OpenSSL\CAss.cnf
+set CAreq2=\OpenSSL\req2CA.ss  
+
+cecopy ..\test\Uss.cnf CE:\OpenSSL
+set Uconf=\OpenSSL\Uss.cnf
+set Ukey=\OpenSSL\keyU.ss
+set Ureq=\OpenSSL\reqU.ss
+set Ucert=\OpenSSL\certU.ss
+
+echo make a certificate request using 'req'
+cerun CE:\OpenSSL\%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new
+if errorlevel 1 goto e_req
+
+echo convert the certificate request into a self signed certificate using 'x509'
+cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% "> \OpenSSL\err.ss"
+if errorlevel 1 goto e_x509
+
+echo --
+echo convert a certificate into a certificate request using 'x509'
+cerun CE:\OpenSSL\%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% "> \OpenSSL\err.ss"
+if errorlevel 1 goto e_x509_2
+
+cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq% -noout
+if errorlevel 1 goto e_vrfy_1
+
+cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq2% -noout
+if errorlevel 1 goto e_vrfy_2
+
+cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %CAcert%
+if errorlevel 1 goto e_vrfy_3
+
+echo --
+echo make another certificate request using 'req'
+cerun CE:\OpenSSL\%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new "> \OpenSSL\err.ss"
+if errorlevel 1 goto e_req_gen
+
+echo --
+echo sign certificate request with the just created CA via 'x509'
+cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial%
+if errorlevel 1 goto e_x_sign
+
+cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %Ucert%
+echo --
+echo Certificate details
+cerun CE:\OpenSSL\%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert%
+
+cecopy CE:%CAcert% .
+cecopy CE:%CAkey% .
+cecopy CE:%CAserial% .
+cecopy CE:%Ucert% .
+cecopy CE:%Ukey% .
+
+echo Everything appeared to work
+echo --
+echo The generated CA certificate is %CAcert%
+echo The generated CA private key is %CAkey%
+echo The current CA signing serial number is in %CAserial%
+
+echo The generated user certificate is %Ucert%
+echo The generated user private key is %Ukey%
+echo --
+
+cedel CE:\OpenSSL\err.ss
+
+goto end
+
+:e_req
+echo error using 'req' to generate a certificate request
+goto end
+:e_x509
+echo error using 'x509' to self sign a certificate request
+goto end
+:e_x509_2
+echo error using 'x509' convert a certificate to a certificate request
+goto end
+:e_vrfy_1
+echo first generated request is invalid
+goto end
+:e_vrfy_2
+echo second generated request is invalid
+goto end
+:e_vrfy_3
+echo first generated cert is invalid
+goto end
+:e_req_gen
+echo error using 'req' to generate a certificate request
+goto end
+:e_x_sign
+echo error using 'x509' to sign a certificate request
+goto end
+
+:end

diff --git a/ms/tpem.bat b/ms/tpem.bat
index 7fc7a83279a8390e1d024fe2c96dd5c821a4d446..cd01792e9f0194c582ffd500ac87f9e1a0193edc 100755 (executable)
--- a/ms/tpem.bat
+++ b/ms/tpem.bat
@@ -1,6 +1,6 @@
-rem called by testpem\r
-\r
-echo test %1 %2\r
-%ssleay% %1 -in %2 -out %tmp1%\r
-%cmp% %2 %tmp1%\r
-\r
+rem called by testpem
+
+echo test %1 %2
+%ssleay% %1 -in %2 -out %tmp1%
+%cmp% %2 %tmp1%
+

diff --git a/ms/tpemce.bat b/ms/tpemce.bat
index 17b2acd390d53a3a9f0da21b786be02c2ba3ab6a..483f559cfa5061c5bf5ba2066a28b49373e039f4 100644 (file)
--- a/ms/tpemce.bat
+++ b/ms/tpemce.bat
@@ -1,8 +1,8 @@
-rem called by testpemce\r
-\r
-echo test %1 %2\r
-cecopy %2 CE:\OpenSSL\r
-cerun CE:\OpenSSL\%ssleay% %1 -in \OpenSSL\%2 -out \OpenSSL\%tmp1%\r
-del %tmp1% >nul 2>&1\r
-cecopy CE:\OpenSSL\%tmp1% .\r
-%cmp% %2 %tmp1%\r
+rem called by testpemce
+
+echo test %1 %2
+cecopy %2 CE:\OpenSSL
+cerun CE:\OpenSSL\%ssleay% %1 -in \OpenSSL\%2 -out \OpenSSL\%tmp1%
+del %tmp1% >nul 2>&1
+cecopy CE:\OpenSSL\%tmp1% .
+%cmp% %2 %tmp1%

diff --git a/ms/x86asm.bat b/ms/x86asm.bat
index 4d80e706e4b9f4ee2f396f291bf024069cdc2a46..03563c6b047d9038bd40bbf90d4fd5fea35dac0c 100755 (executable)
--- a/ms/x86asm.bat
+++ b/ms/x86asm.bat
@@ -1,57 +1,57 @@
-\r
-@echo off\r
-echo Generating x86 assember\r
-\r
-echo Bignum\r
-cd crypto\bn\asm\r
-perl x86.pl win32n > bn-win32.asm\r
-cd ..\..\..\r
-\r
-echo DES\r
-cd crypto\des\asm\r
-perl des-586.pl win32n > d-win32.asm\r
-cd ..\..\..\r
-\r
-echo "crypt(3)"\r
-\r
-cd crypto\des\asm\r
-perl crypt586.pl win32n > y-win32.asm\r
-cd ..\..\..\r
-\r
-echo Blowfish\r
-\r
-cd crypto\bf\asm\r
-perl bf-586.pl win32n > b-win32.asm\r
-cd ..\..\..\r
-\r
-echo CAST5\r
-cd crypto\cast\asm\r
-perl cast-586.pl win32n > c-win32.asm\r
-cd ..\..\..\r
-\r
-echo RC4\r
-cd crypto\rc4\asm\r
-perl rc4-586.pl win32n > r4-win32.asm\r
-cd ..\..\..\r
-\r
-echo MD5\r
-cd crypto\md5\asm\r
-perl md5-586.pl win32n > m5-win32.asm\r
-cd ..\..\..\r
-\r
-echo SHA1\r
-cd crypto\sha\asm\r
-perl sha1-586.pl win32n > s1-win32.asm\r
-cd ..\..\..\r
-\r
-echo RIPEMD160\r
-cd crypto\ripemd\asm\r
-perl rmd-586.pl win32n > rm-win32.asm\r
-cd ..\..\..\r
-\r
-echo RC5\32\r
-cd crypto\rc5\asm\r
-perl rc5-586.pl win32n > r5-win32.asm\r
-cd ..\..\..\r
-\r
-echo on\r
+
+@echo off
+echo Generating x86 assember
+
+echo Bignum
+cd crypto\bn\asm
+perl x86.pl win32n > bn-win32.asm
+cd ..\..\..
+
+echo DES
+cd crypto\des\asm
+perl des-586.pl win32n > d-win32.asm
+cd ..\..\..
+
+echo "crypt(3)"
+
+cd crypto\des\asm
+perl crypt586.pl win32n > y-win32.asm
+cd ..\..\..
+
+echo Blowfish
+
+cd crypto\bf\asm
+perl bf-586.pl win32n > b-win32.asm
+cd ..\..\..
+
+echo CAST5
+cd crypto\cast\asm
+perl cast-586.pl win32n > c-win32.asm
+cd ..\..\..
+
+echo RC4
+cd crypto\rc4\asm
+perl rc4-586.pl win32n > r4-win32.asm
+cd ..\..\..
+
+echo MD5
+cd crypto\md5\asm
+perl md5-586.pl win32n > m5-win32.asm
+cd ..\..\..
+
+echo SHA1
+cd crypto\sha\asm
+perl sha1-586.pl win32n > s1-win32.asm
+cd ..\..\..
+
+echo RIPEMD160
+cd crypto\ripemd\asm
+perl rmd-586.pl win32n > rm-win32.asm
+cd ..\..\..
+
+echo RC5\32
+cd crypto\rc5\asm
+perl rc5-586.pl win32n > r5-win32.asm
+cd ..\..\..
+
+echo on