Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4686 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/copy-crypto-confs b/regress/scripts/copy-crypto-confs
index 28df20cb21532c442dbda41243630daf7c138f86..c981df30fb92923ad2022e5f5777df1410bb4d8d 100755 (executable)
--- a/regress/scripts/copy-crypto-confs
+++ b/regress/scripts/copy-crypto-confs
@@ -4,3 +4,4 @@
 /bin/cp -f scripts/crypto-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
 /bin/cp -f scripts/cryptokeypair.pem bin/cryptokeypair.pem
+/bin/cp -f scripts/master2048.cert bin/master2048.cert

diff --git a/regress/scripts/crypto-bacula-fd.conf.in b/regress/scripts/crypto-bacula-fd.conf.in
index ec4152d2b8411dac78d99252f06d296110857eb2..0dc057ef5ac8c97a8a3ed48c366d09ebfe4050db 100644 (file)
--- a/regress/scripts/crypto-bacula-fd.conf.in
+++ b/regress/scripts/crypto-bacula-fd.conf.in
@@ -1,7 +1,7 @@
 #
 # Default  Bacula File Daemon Configuration file
 #
-#  For Bacula release 1.33
+#  For Bacula release 2.0
 #
 # There is not much to change here except perhaps the
 # File daemon Name to
@@ -27,6 +27,7 @@ FileDaemon {                          # this is me
   PKI Signatures = Yes
   PKI Encryption = Yes
   PKI Keypair = "@scriptdir@/cryptokeypair.pem"
+  PKI Master Key = "@scriptdir@/master2048.cert"
 }
 
 # Send all messages except skipped files back to Director

diff --git a/regress/scripts/master2048.cert b/regress/scripts/master2048.cert
new file mode 100644 (file)
index 0000000..1927c2e
--- /dev/null
+++ b/regress/scripts/master2048.cert
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----\r
+MIIExzCCA6+gAwIBAgIJANItYfYlLjH/MA0GCSqGSIb3DQEBBQUAMIGdMQswCQYD\r
+VQQGEwJVUzELMAkGA1UECBMCTlkxEzARBgNVBAcTCkJpbmdoYW10b24xJTAjBgNV\r
+BAoTHEdpYW50IE1hcmtldCBCaW5naGFtdG9uIEluYy4xHTAbBgNVBAMTFEJhY3Vs\r
+YSBCYWNrdXAgU3lzdGVtMSYwJAYJKoZIhvcNAQkBFhdiYWNrdXBAZ2lhbnRtYXJr\r
+ZXRzLmNvbTAeFw0wNzA0MjUyMDMxNTFaFw0wNzA1MjUyMDMxNTFaMIGdMQswCQYD\r
+VQQGEwJVUzELMAkGA1UECBMCTlkxEzARBgNVBAcTCkJpbmdoYW10b24xJTAjBgNV\r
+BAoTHEdpYW50IE1hcmtldCBCaW5naGFtdG9uIEluYy4xHTAbBgNVBAMTFEJhY3Vs\r
+YSBCYWNrdXAgU3lzdGVtMSYwJAYJKoZIhvcNAQkBFhdiYWNrdXBAZ2lhbnRtYXJr\r
+ZXRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPbvxVmZErPu\r
+LsvVe2zi31Mygq4pbEVTUi2K6T9kNTC1mmPhPxZJF3vCLQ6/tMKXoc6Wy0cLEs9o\r
+JM9dFu1oVexkLK0oi7nWlYlwg0ua4dADUS0iUIsxPh8f/jXGaaPFcof5f/bwHCwK\r
+Y6GPAdE7oBaPrDip5WCsdhA9lLGcmZBKeabemDfHyrfaLmrzRt3ZXH3dMa2ROC2A\r
+YIo0ReFaklNCJDxLojbG0BezW6F4IbfsQSelr6g72io88oBEAa0aysOGRKdaQ4Da\r
+18aVsFfbLQ6z/DAAu66HgQJG9X5bWsew3aUVThKIICtXoI8FMSgk+yZHKpzj+K6o\r
+KiZ+bMcRemsCAwEAAaOCAQYwggECMB0GA1UdDgQWBBSi7vn39ZcGIbzV3y6zvR0V\r
+T2zK/DCB0gYDVR0jBIHKMIHHgBSi7vn39ZcGIbzV3y6zvR0VT2zK/KGBo6SBoDCB\r
+nTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5ZMRMwEQYDVQQHEwpCaW5naGFtdG9u\r
+MSUwIwYDVQQKExxHaWFudCBNYXJrZXQgQmluZ2hhbXRvbiBJbmMuMR0wGwYDVQQD\r
+ExRCYWN1bGEgQmFja3VwIFN5c3RlbTEmMCQGCSqGSIb3DQEJARYXYmFja3VwQGdp\r
+YW50bWFya2V0cy5jb22CCQDSLWH2JS4x/zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3\r
+DQEBBQUAA4IBAQAnek7pGLAehonnbSIkB8XD27l2EU73sYEMCm6YI5U5fyCsYN40\r
+KkYm32jhZu15xR+uuiYZWJqzZqz0O5xrK4Rxc36KAD5FMeYEoIDjdK1hXnrA2Jvo\r
+w7wlhQJ/JDp/gGV0yDCZe2jURlVDR/YT1ECnIUZ9jr2GX6w2Uwk1iJedvbKRlHyc\r
+PxEHpTGXl6YrmlVIpcNIuuHn4dY1FBul2VSC4RAhwmXvNSQDnQoQodX5QaJN1uc8\r
+tsU3lBtsSsKzerBFyKujwi8I0qcOtzHqy/zYbr3F4uHTSVheCja4FWskrRWCMQzc\r
+ySn09DurGBHU+iixlOsLy9xKwytntJPZqXV6\r
+-----END CERTIFICATE-----
\ No newline at end of file