diff --git a/tests/testenc.bat b/tests/testenc.bat index 93dfc0c8b3..84f48f2a3f 100644 --- a/tests/testenc.bat +++ b/tests/testenc.bat @@ -2,32 +2,35 @@ setlocal enabledelayedexpansion REM testenc.bat -set test=p +set test=P set openssl_bin=%1 set openssl_bin=%openssl_bin:/=\% if not exist %openssl_bin% exit /b 1 +echo copy %srcdir%\openssl.cnf %test% copy %srcdir%\openssl.cnf %test% echo cat -%openssl_bin% enc -in %test% -out %test%.cipher -%openssl_bin% enc -in %test%.cipher -out %test%.clear -fc /b %test% %test%.clear +echo %openssl_bin% enc -in %test% -out %test%.CIPHER +%openssl_bin% enc -in %test% -out %test%.CIPHER +%openssl_bin% enc -in %test%.CIPHER -out %test%.CLEAR +fc /b %test% %test%.CLEAR if !errorlevel! neq 0 ( exit /b 1 ) else ( - del %test%.cipher %test%.clear + del %test%.CIPHER %test%.CLEAR ) echo base64 -%openssl_bin% enc -a -e -in %test% -out %test%.cipher -%openssl_bin% enc -a -d -in %test%.cipher -out %test%.clear -fc /b %test% %test%.clear +%openssl_bin% enc -a -e -in %test% -out %test%.CIPHER +%openssl_bin% enc -a -d -in %test%.CIPHER -out %test%.CLEAR +dir +fc /b %test% %test%.CLEAR if !errorlevel! neq 0 ( exit /b 1 ) else ( - del %test%.cipher %test%.clear + del %test%.CIPHER %test%.CLEAR ) for %%i in ( @@ -45,23 +48,23 @@ for %%i in ( rc4 rc4-40 ) do ( echo %%i - %openssl_bin% %%i -e -k test -in %test% -out %test%.%%i.cipher - %openssl_bin% %%i -d -k test -in %test%.%%i.cipher -out %test%.%%i.clear - fc /b %test% %test%.%%i.clear + %openssl_bin% %%i -e -k test -in %test% -out %test%.%%i.CIPHER + %openssl_bin% %%i -d -k test -in %test%.%%i.CIPHER -out %test%.%%i.CLEAR + fc /b %test% %test%.%%i.CLEAR if !errorlevel! neq 0 ( exit /b 1 ) else ( - del %test%.%%i.cipher %test%.%%i.clear + del %test%.%%i.CIPHER %test%.%%i.CLEAR ) echo %%i base64 - %openssl_bin% %%i -a -e -k test -in %test% -out %test%.%%i.cipher - %openssl_bin% %%i -a -d -k test -in %test%.%%i.cipher -out %test%.%%i.clear - fc /b %test% %test%.%%i.clear + %openssl_bin% %%i -a -e -k test -in %test% -out %test%.%%i.CIPHER + %openssl_bin% %%i -a -d -k test -in %test%.%%i.CIPHER -out %test%.%%i.CLEAR + fc /b %test% %test%.%%i.CLEAR if !errorlevel! neq 0 ( exit /b 1 ) else ( - del %test%.%%i.cipher %test%.%%i.clear + del %test%.%%i.CIPHER %test%.%%i.CLEAR ) )