From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 7 Feb 2014 23:28:38 +0100 Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Update to openssl1.0.1f xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2 libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743 libX11 commit aacf95dacc7c598e7297894580d4d655593813b2 xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3 --- openssl/ms/bcb4.bat | 12 +-- openssl/ms/do_nt.bat | 14 ++-- openssl/ms/tenc.bat | 28 +++---- openssl/ms/tencce.bat | 38 ++++----- openssl/ms/testenc.bat | 188 +++++++++++++++++++++--------------------- openssl/ms/testencce.bat | 194 +++++++++++++++++++++---------------------- openssl/ms/testpem.bat | 64 +++++++-------- openssl/ms/testpemce.bat | 84 +++++++++---------- openssl/ms/testss.bat | 196 ++++++++++++++++++++++---------------------- openssl/ms/testssce.bat | 208 +++++++++++++++++++++++------------------------ openssl/ms/tpem.bat | 12 +-- openssl/ms/tpemce.bat | 16 ++-- 12 files changed, 527 insertions(+), 527 deletions(-) (limited to 'openssl/ms') diff --git a/openssl/ms/bcb4.bat b/openssl/ms/bcb4.bat index 71a670e79..00fb9e845 100644 --- a/openssl/ms/bcb4.bat +++ b/openssl/ms/bcb4.bat @@ -1,6 +1,6 @@ -perl Configure BC-32 -perl util\mkfiles.pl > MINFO - -@rem create make file -perl util\mk1mf.pl no-asm BC-NT > bcb.mak - +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/openssl/ms/do_nt.bat b/openssl/ms/do_nt.bat index 9c06c27ca..e2d525e05 100644 --- a/openssl/ms/do_nt.bat +++ b/openssl/ms/do_nt.bat @@ -1,7 +1,7 @@ - -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 + +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/openssl/ms/tenc.bat b/openssl/ms/tenc.bat index 466fdfccb..a4fa7f365 100644 --- a/openssl/ms/tenc.bat +++ b/openssl/ms/tenc.bat @@ -1,14 +1,14 @@ -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 +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/openssl/ms/tencce.bat b/openssl/ms/tencce.bat index 6a944d767..c8b1acd4b 100644 --- a/openssl/ms/tencce.bat +++ b/openssl/ms/tencce.bat @@ -1,19 +1,19 @@ -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 +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/openssl/ms/testenc.bat b/openssl/ms/testenc.bat index 4b99bd589..f8e90939e 100644 --- a/openssl/ms/testenc.bat +++ b/openssl/ms/testenc.bat @@ -1,94 +1,94 @@ -@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 - +@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/openssl/ms/testencce.bat b/openssl/ms/testencce.bat index 04faa5d99..1da3e0861 100644 --- a/openssl/ms/testencce.bat +++ b/openssl/ms/testencce.bat @@ -1,97 +1,97 @@ -@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 - +@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/openssl/ms/testpem.bat b/openssl/ms/testpem.bat index 005f13b67..8b2e844d3 100644 --- a/openssl/ms/testpem.bat +++ b/openssl/ms/testpem.bat @@ -1,32 +1,32 @@ -@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 +@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/openssl/ms/testpemce.bat b/openssl/ms/testpemce.bat index c793c3e51..ac64a7912 100644 --- a/openssl/ms/testpemce.bat +++ b/openssl/ms/testpemce.bat @@ -1,42 +1,42 @@ -@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 +@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/openssl/ms/testss.bat b/openssl/ms/testss.bat index b4aaf3c60..5afa131db 100644 --- a/openssl/ms/testss.bat +++ b/openssl/ms/testss.bat @@ -1,98 +1,98 @@ -@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 +@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/openssl/ms/testssce.bat b/openssl/ms/testssce.bat index dbb25abdb..18381ed2f 100644 --- a/openssl/ms/testssce.bat +++ b/openssl/ms/testssce.bat @@ -1,104 +1,104 @@ -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 +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/openssl/ms/tpem.bat b/openssl/ms/tpem.bat index 7fc7a8327..cd01792e9 100644 --- a/openssl/ms/tpem.bat +++ b/openssl/ms/tpem.bat @@ -1,6 +1,6 @@ -rem called by testpem - -echo test %1 %2 -%ssleay% %1 -in %2 -out %tmp1% -%cmp% %2 %tmp1% - +rem called by testpem + +echo test %1 %2 +%ssleay% %1 -in %2 -out %tmp1% +%cmp% %2 %tmp1% + diff --git a/openssl/ms/tpemce.bat b/openssl/ms/tpemce.bat index 17b2acd39..483f559cf 100644 --- a/openssl/ms/tpemce.bat +++ b/openssl/ms/tpemce.bat @@ -1,8 +1,8 @@ -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% +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% -- cgit v1.2.3