generate intermediary files in temp dir, fix generation of test_dsa_privkey

build.xml

@@ -198,7 +198,7 @@
         <exec executable="openssl" dir="." failonerror="true">
             <arg value="dsaparam"/>
             <arg value="-out"/>
-            <arg value="dsaparam.pem"/>
+            <arg value="${java.io.tmpdir}/dsaparam.pem"/>
             <arg value="1024"/>
         </exec>
 
@@ -206,17 +206,29 @@
         <exec executable="openssl" dir="." failonerror="true">
             <arg value="gendsa"/>
             <arg value="-out"/>
-            <arg value="crypto/fixtures/test_dsa_privkey.pem"/>
-            <arg value="dsaparam.pem"/>
+            <arg value="${java.io.tmpdir}/test_dsa_privkey.pem"/>
+            <arg value="${java.io.tmpdir}/dsaparam.pem"/>
         </exec>
 
-        <openssl algo="pkcs8" arg="-topk8" key="test_dsa_privkey.pem"/>
+        <exec executable="openssl" dir="." failonerror="true">
+            <arg value="pkcs8"/>
+            <arg value="-topk8"/>
+            <arg value="-in"/>
+            <arg value="${java.io.tmpdir}/test_dsa_privkey.pem"/>
+            <arg value="-inform"/>
+            <arg value="pem"/>
+            <arg value="-out"/>
+            <arg value="crypto/fixtures/test_dsa_privkey.pem"/>
+            <arg value="-outform"/>
+            <arg value="pem"/>
+            <arg value="-nocrypt"/>
+        </exec>
 
         <echo>generating test_dsa_pubkey.pem</echo>
         <exec executable="openssl" dir="." failonerror="true">
             <arg value="dsa"/>
             <arg value="-in"/>
-            <arg value="${source.home}/test/fixtures/test_dsa_privkey.pem"/>
+            <arg value="crypto/fixtures/test_dsa_privkey.pem"/>
             <arg value="-out"/>
             <arg value="crypto/fixtures/test_dsa_pubkey.pem"/>
             <arg value="-outform"/>
@@ -252,7 +264,7 @@
         <exec executable="openssl" dir="." failonerror="true">
             <arg value="genrsa"/>
             <arg value="-out"/>
-            <arg value="crypto/altnames/altnames-agent-key-trans.pem"/>
+            <arg value="${java.io.tmpdir}/altnames-agent-key-trans.pem"/>
             <arg value="1024"/>
         </exec>
 
@@ -260,7 +272,7 @@
             <arg value="pkcs8"/>
             <arg value="-topk8"/>
             <arg value="-in"/>
-            <arg value="crypto/altnames/altnames-agent-key-trans.pem"/>
+            <arg value="${java.io.tmpdir}/altnames-agent-key-trans.pem"/>
             <arg value="-inform"/>
             <arg value="pem"/>
             <arg value="-out"/>

crypto/altnames/altnames-agent-key.csr

@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICDzCCAXgCAQAwUDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1OMREwDwYDVQQH
 EwhOZXctWW9yazEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMIGf
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZYI/9pwvMWSnnP6FoxcTedS5mnGga
-zNdYxroezNS/tz5QChUmzxKYIf/xmT2GKFx3q9UA7nSQvuMOWmQawbV/cBLZ2G1s
-6+QkmeoVFgUIW1dGor/ngDFsPeNaDDC/zOJfZAiYJaxW81QnQAGl3Lb6MOwAx+5w
-J5QsP5FRPWVQFQIDAQABoH8wfQYJKoZIhvcNAQkOMXAwbjAJBgNVHRMEAjAAMAsG
+MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDufS0lEcrx1dschV3Mmui5KUCk7TTa
+itz1R1Sca1M0n1/Oe0igwZGQWGl9AdKWkxQhXxp+Ta9aO1oDfpX1uFaDCZKd/88Y
+rl4eJpYtDoG+rjuEv0qouVXcGvmTYjOTFpXK34H1FyrpIaA6O13GmfAyS5BwF/dZ
+EZoAPXADJ7jePwIDAQABoH8wfQYJKoZIhvcNAQkOMXAwbjAJBgNVHRMEAjAAMAsG
 A1UdDwQEAwIF4DBUBgNVHREETTBLghNob3N0MS5hdmF0YXItanMuY29tghNob3N0
 Mi5hdmF0YXItanMub3JnghNob3N0My5hdmF0YXItanMubmV0hwQKpmm5hwQKpmm6
-MA0GCSqGSIb3DQEBCwUAA4GBAAs8taJ5QzliHVgS3gKs8b4u2fg8759EYMGxb6Ad
-MSf4aigA17PX32u9wufxohFyM3kzewp2isNPKXkQwkE+wNaaui25MJbCUulIQhaS
-Mc9vIHxojCp0R6ZQ8lOqZy0SPbcivPsOl0MrY3CY1/Oh/oIQH/mICoGF+qXlKeJ9
-PQ0w
+MA0GCSqGSIb3DQEBCwUAA4GBALBIhS45YmC8kzhVUxjFHdiUIWyXBmUXye6VBiCI
+o81trAeyIkvZnwTB7eb2N3FnHTzQilztfAuFGa5ZH2z/yyo4gskBJEMYQyNQWd18
+MWlK1pLj6Mf3hza5U1fIpK/I3mcOUZ46KdtJ+tADkM/Vtz9bKXRqkh1VVSbFsOSH
+Tinv
 -----END CERTIFICATE REQUEST-----

crypto/altnames/altnames-agent-key.pem

@@ -1,16 +1,16 @@
 -----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJlgj/2nC8xZKec/
-oWjFxN51LmacaBrM11jGuh7M1L+3PlAKFSbPEpgh//GZPYYoXHer1QDudJC+4w5a
-ZBrBtX9wEtnYbWzr5CSZ6hUWBQhbV0aiv+eAMWw941oMML/M4l9kCJglrFbzVCdA
-AaXctvow7ADH7nAnlCw/kVE9ZVAVAgMBAAECgYALckxstrnHr2PUMUh/hDr0CzTC
-TavrTBxKMNKVF95MzIUm/gmkEtIlbmwmgLQ5vetgtv83iZRDdSuG17Ie2RQNaCDu
-TZc6kIiIPCadzgfGEuJhXHxFpMMRM0kVG0WLlbPQnHVhNid+2eB3bAtOkNYtOxhO
-rzCanSQDW/tVKCIxIQJBAMfY+WM+AdXn+HHpH4UgtQdHlnYnyFhq5ZIfxaBRtFRp
-fhvtYFMBrPzZo/HvCunH3/n8Qq9hjKpZ7F0dYF6u3q0CQQDEePo8DaZz/AcQJN4V
-VjbSBbsEDJLhLr0xHTgtjSN7b0kB3XkQccTYu3PWb20knn5hkPbpiHMtvbQ9LRBa
-2OwJAkEAuZnP2xReXgum2Bva0yfSGGWq3icKUNtORAxP3RmkcXTb0xH9EHoQ728t
-bGZF62Jep+tY/0qIejkzZDMBKk4brQJBALtEHC8VS6yNciX/Hfb0X/g7IhAv8+fS
-Zt3jXeJ8/m7umYW/lV8JMXjq4vRm7H7U2t0gEVhyiGX2xU7yHv6YeBECQDTuMK6D
-ZW4/Y93aqeHPKApm/U6dRnSkN52IT45TMplfBTMGBHau9JGa1i5UDyNLRZvf1+6c
-STsA0E8QUrR8Rho=
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAO59LSURyvHV2xyF
+Xcya6LkpQKTtNNqK3PVHVJxrUzSfX857SKDBkZBYaX0B0paTFCFfGn5Nr1o7WgN+
+lfW4VoMJkp3/zxiuXh4mli0Ogb6uO4S/Sqi5Vdwa+ZNiM5MWlcrfgfUXKukhoDo7
+XcaZ8DJLkHAX91kRmgA9cAMnuN4/AgMBAAECgYBjTB063QCp1ogHhQP8B9e0GJgA
+0375K246dfulsQ4Qz/bdCvm/bTkFZ7psQREEfrKX/ngSdJf5MtMUt2UKzTi/QrqW
+3nDqssBDUUxGqETMxmpKAfiueo+9+pXYqTcYmjbhPmfjlt8yoa0xzTX8/SZoToWv
+VoQxokCzsTM7eUJ1uQJBAPqJ7Tz8xQv8xgqAC/vzfLPqQwVwlGyJ/rdfMw/Ant01
+S9/4xnJ4FL/tpYnoIppL8Eba1RAKCc7FwDbtejSPUVMCQQDzsAIs9Zw0jsnshlXe
+LrRBRWKFrGeZK9D7utgd/RCGpmLI2S40ZDvh4dUOwPI0IPvrJ1BU3wUQ4KJw4+4X
+B4XlAkBRuaA7nrCgQmpPjolaPIjXH3mRUrH33ePK6TD82HZ57iK8AqipOmZ6XQj8
+vU5cSp0sX8HUo5Gjc3pJ8JlGf+GlAkEAqyDUNkx42LPZe39O98tmjFu0d1j+G6OY
+i97HfC/GFjjsME3L08D8CIF2BHlc3Vy4bIfcMu22+gY2LP7zqTqAPQJBAJud179C
+ox0Rpah2Q0OhPCWOXgI/g6GoWmLklFSuHas5CdAQ1wZ/a2d1Etfl5XmKa2O5evsQ
+KTXO0Gy2JD/wrKc=
 -----END PRIVATE KEY-----

crypto/altnames/altnames-agent.crt

@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgIJAO35EiAE4sZCMA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNV
+MIICjjCCAfegAwIBAgIJAL2JSfiga6QaMA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTjERMA8GA1UEBxMITmV3LVlvcmsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xNDA5MTYxOTU3NTVaFw0xMTEy
-MjIxOTU3NTVaMFAxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjERMA8GA1UEBxMI
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xNDA5MTcyMDM2MzVaFw0xMTEy
+MjMyMDM2MzVaMFAxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjERMA8GA1UEBxMI
 TmV3LVlvcmsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmWCP/acLzFkp5z+haMXE3nUuZpxoGszX
-WMa6HszUv7c+UAoVJs8SmCH/8Zk9hihcd6vVAO50kL7jDlpkGsG1f3AS2dhtbOvk
-JJnqFRYFCFtXRqK/54AxbD3jWgwwv8ziX2QImCWsVvNUJ0ABpdy2+jDsAMfucCeU
-LD+RUT1lUBUCAwEAAaNwMG4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwVAYDVR0R
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7n0tJRHK8dXbHIVdzJrouSlApO002orc
+9UdUnGtTNJ9fzntIoMGRkFhpfQHSlpMUIV8afk2vWjtaA36V9bhWgwmSnf/PGK5e
+HiaWLQ6Bvq47hL9KqLlV3Br5k2IzkxaVyt+B9Rcq6SGgOjtdxpnwMkuQcBf3WRGa
+AD1wAye43j8CAwEAAaNwMG4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwVAYDVR0R
 BE0wS4ITaG9zdDEuYXZhdGFyLWpzLmNvbYITaG9zdDIuYXZhdGFyLWpzLm9yZ4IT
 aG9zdDMuYXZhdGFyLWpzLm5ldIcECqZpuYcECqZpujANBgkqhkiG9w0BAQsFAAOB
-gQAhERADkkFh/4Lz26tVJGNF2Bwt0FfvjDw/iSz7Eb7xgpbtcqR4YamJNExH//On
-3djYKbXPHQ7WLFjTVdammUItrQ/4N7SGBVHzlV9PZlYXx9NhgDwFL9bb56Ppgkeo
-yjhoo0qERzyNQO8wc5qVv8tLdiyZ0g+1p0FlNDtGttKIoA==
+gQC+qTQYe/bdjgu6zFfNybpbu+pcGAYHcOndQDf3QWTcRft6LzNQZrZRi63BfZvB
+v27hzSrAJkHyNoGwAK/7y4pfOsNuRZrWcCfKVIosptNOr9yu2rVtjWRCfzNNyKvD
+9XbiUWd3uybNZKPLO34+QGSnO0JDe85QV4gTuKnBxaKh2g==
 -----END CERTIFICATE-----

crypto/fixtures/test_dsa_privkey.pem

@@ -1,15 +1,9 @@
 -----BEGIN PRIVATE KEY-----
-MIICTQIBADCCAi0GByqGSM44BAEwggIgAoIBAQCIkJHjQcK0DqmTzrheEpx6R7w3
-hyGWunBymEBekfBJAYeW/UkkXKNo+q6Ba3PBkfnmDuqkiJPd+aDpXo9/M1/HixAa
-VKNyRlo3TZZFQBpyfS9rpRvDJhXstnO4eUfNrIcuX9u0Z5MX7Mv714wsp+WX6v7l
-slcMxaHfFQPU2V1/5+wixtVkj1A3N/cvX/TtdVMt51BhoTvs6pW675x+gG1v4rky
-xB0cww3bQEaMoi8aQkgK4LjjwaQPHXCnHPa9IkSLoWpeu4zpz3Ks++EkpJ9tUVgr
-afzYwxcw0270PCrCy/oiDp0hXLB0oOtLDU3P2P1NYDkGiU21rfIw8esSMK4hAhUA
-qrRlnT/fqxkTVyq3qPSFlOKxZRUCggEAVsj0wqf0MEnuWjv4tFuWA0qD2WTgP/o0
-EFGA54I3hac7EdCuqlJNQEb5VwAEMoR+gd8Q8j0pkqkSCnMZOmvuYbEM8sd8Yv6+
-9/URhuZxMOtRaV/0H/f4ve7Ah12/c1gt6nIRnwvyDp5EZJDhK+DWhJH8YBRN4Ylz
-M+DqpbRv8tOl/h54M1ZgYXpqiAlSmGc9xnRerD7K+r+LW7MBWKtTGn0KtvuSbR18
-DQb8cGJJ1wS3qXwt1B3qqZwvSfFyb3Hov61KiXmFc3KdXTBzF0JDPhePmdr42hEZ
-v2M9jGAuSirTuHACSqRAPIXrW3F9aAZzvOaH/HokwZ79eGDVO+DEuwQXAhUAnd1e
-wtOzVXk4lFNVkz9pxTYDKhE=
+MIIBSwIBADCCASsGByqGSM44BAEwggEeAoGBAP0OTiut4UkuzP+rDS0QwdIXkEzp
+QL/CtvJ17wA5kz8BVBObCVGq4MlppxsXs2FGFIz+QbfsA/k/n3yeRENICGyX1eR4
+qkTe8lB6bhVqPkQJJNtuehAxkRFMykBQdVDK0TQcDWB3dDZxJtCWSDBMClyepu6H
+uAwklMjj6Ev9cGTbAhUA4s6CnsBv6LbafZtH/B46w8rvSXsCgYA0pENUOpfd8AWq
+rt/54A+Qr7VYocPGDriEoVRESegMvm/dk6a+Bclx+t8PDCoRsE9F6RNXEgH+v3bl
+kh7vmYENx84H+OkavXN8OHfAsxxpo2yR46V3OLKz2i3x+kKRkzonXANBzRG8DGyn
+Xii7470Qc6L6EQ2ao9pb+3iTHrra5QQXAhUAzkJJTRueWiigIbz4YDNoHqTIEz0=
 -----END PRIVATE KEY-----

crypto/fixtures/test_dsa_pubkey.pem

@@ -1,20 +1,12 @@
 -----BEGIN PUBLIC KEY-----
-MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQCIkJHjQcK0DqmTzrheEpx6R7w3hyGW
-unBymEBekfBJAYeW/UkkXKNo+q6Ba3PBkfnmDuqkiJPd+aDpXo9/M1/HixAaVKNy
-Rlo3TZZFQBpyfS9rpRvDJhXstnO4eUfNrIcuX9u0Z5MX7Mv714wsp+WX6v7lslcM
-xaHfFQPU2V1/5+wixtVkj1A3N/cvX/TtdVMt51BhoTvs6pW675x+gG1v4rkyxB0c
-ww3bQEaMoi8aQkgK4LjjwaQPHXCnHPa9IkSLoWpeu4zpz3Ks++EkpJ9tUVgrafzY
-wxcw0270PCrCy/oiDp0hXLB0oOtLDU3P2P1NYDkGiU21rfIw8esSMK4hAhUAqrRl
-nT/fqxkTVyq3qPSFlOKxZRUCggEAVsj0wqf0MEnuWjv4tFuWA0qD2WTgP/o0EFGA
-54I3hac7EdCuqlJNQEb5VwAEMoR+gd8Q8j0pkqkSCnMZOmvuYbEM8sd8Yv6+9/UR
-huZxMOtRaV/0H/f4ve7Ah12/c1gt6nIRnwvyDp5EZJDhK+DWhJH8YBRN4YlzM+Dq
-pbRv8tOl/h54M1ZgYXpqiAlSmGc9xnRerD7K+r+LW7MBWKtTGn0KtvuSbR18DQb8
-cGJJ1wS3qXwt1B3qqZwvSfFyb3Hov61KiXmFc3KdXTBzF0JDPhePmdr42hEZv2M9
-jGAuSirTuHACSqRAPIXrW3F9aAZzvOaH/HokwZ79eGDVO+DEuwOCAQYAAoIBAQCF
-3DqJJIVYwvovyP4KzPak4enwlY80mzrCFYvR34+xgk0WAP0BZzW4lmzlsz+7dnBE
-BS32aCZkyu9fobWapffxkTM1fnZ8ocLkYfWFpLgjpRRw+4QxQQvntVaoVe5bWqJK
-pGVNfAbJoGRv38XqjgHxJRCixO/eqzgF5rcfBdeDJ/iELXhAJonxddeNAtGxcx+u
-0UmVNd6UQge0ym67k3r54XUHLSzs4YKTLqBFgI0lp4uflpJToPy8azGezBc/iqqY
-dT8Ul+5IP0vMgozRbWr4mOx6yRO8FKot2f1T1eByhnh819ZNWfURP6CU7Edsk9q7
-Sb0hjvZQ5OhY+bSL9Xwv
+MIIBtzCCASsGByqGSM44BAEwggEeAoGBAP0OTiut4UkuzP+rDS0QwdIXkEzpQL/C
+tvJ17wA5kz8BVBObCVGq4MlppxsXs2FGFIz+QbfsA/k/n3yeRENICGyX1eR4qkTe
+8lB6bhVqPkQJJNtuehAxkRFMykBQdVDK0TQcDWB3dDZxJtCWSDBMClyepu6HuAwk
+lMjj6Ev9cGTbAhUA4s6CnsBv6LbafZtH/B46w8rvSXsCgYA0pENUOpfd8AWqrt/5
+4A+Qr7VYocPGDriEoVRESegMvm/dk6a+Bclx+t8PDCoRsE9F6RNXEgH+v3blkh7v
+mYENx84H+OkavXN8OHfAsxxpo2yR46V3OLKz2i3x+kKRkzonXANBzRG8DGynXii7
+470Qc6L6EQ2ao9pb+3iTHrra5QOBhQACgYEA5lxof4p3/Ae2Vj4cEFk45yxtfd6w
+Ow9woGlNiD44gjVs7uAzWi0IY/cVI2kVG1aMigGMkP4m3Ce8W4lt6LVxves/F0tG
+vAF9i7htcMWxBS45/3HfWyMVPscGK7gpCmvjSxBI0CZkFNYVqa1374Xnxx444Hgb
+GEcfKhQy4+Jae9A=
 -----END PUBLIC KEY-----