Merge branch 'develop' of ssh://code.leap.se/bitmask into develop

4 files changed, 71 insertions, 92 deletions

diff --git a/files/cert/bitmask.net.crt b/files/cert/bitmask.net.crt
index 0a79748..0a0b23d 100644
--- a/files/cert/bitmask.net.crt
+++ b/files/cert/bitmask.net.crt
@@ -1,34 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIFcDCCBFigAwIBAgIRAPI5JrBTlfnzttU9pdzthrgwDQYJKoZIhvcNAQEF
-BQAwQTELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUdBTkRJIFNBUzEeMBwGA1UE
-AxMVR2FuZGkgU3RhbmRhcmQgU1NMIENBMB4XDTEyMTEyMTAwMDAwMFoXDTEz
-MTEyMTIzNTk1OVowVjEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRh
-dGVkMRswGQYDVQQLExJHYW5kaSBTdGFuZGFyZCBTU0wxFDASBgNVBAMTC2Jp
-dG1hc2submV0MIIBuDANBgkqhkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcApcCk
-OAyWjK5UlIWZfbqHdOBHn6IueO5NkkM9Ku182Uk9TO4ts+ZXICx9w2AXmOq1
-XGvpk2ygXryFoGFZ6UBkDMK1eoAHG2Yrc8BXMP5+ntsUXJlzN4TVJBjS0srF
-aNwiRPb+aGzjGeSJUNJ7uLPIfj2ZnFF8/JW2lnRAGrGC6mCual2QmSLFV6Eb
-galmYmw7uJCZTMiUgDLtC8w81rGYKto9DvkUrF/NY5aasodIJ95UkMG7iUEs
-QsQ8DPXRvUUsTwaJv6Cy8lDsyC78rSHmCIWjKfNIRoLFRj5ffV41M4AoSMPU
-/Bwuix/z/RSv+2pUQF5xhhtf3zeMozHO99whpb1YGPNXkof8ibSi0nd0bPg6
-H5tZHnwocBt+XJ/e09TnnWGUWHzRif3yJI7l6WXjuSNr8Nkw/FujeNtUcRtN
-5P70dhUk7O7lDD2oeJdQFnIyAOL2fsT6KSUgSwpQUx9jT83rZzs1j+1LJ0UO
-e67vdkHKXkbnRuOGcG02YGLQpxO1bkFdB+GXraw4O3fzIBy+9joZJi4MNwID
-AQABo4IBtjCCAbIwHwYDVR0jBBgwFoAUtqj/oqgv0KbNS7Fo8+dQEDGneSEw
-HQYDVR0OBBYEFBNrdkI3BIKlK/gEK9PTiUz43gjhMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBgBgNVHSAEWTBXMEsGCysGAQQBsjEBAgIaMDwwOgYIKwYBBQUHAgEWLmh0
-dHA6Ly93d3cuZ2FuZGkubmV0L2NvbnRyYWN0cy9mci9zc2wvY3BzL3BkZi8w
-CAYGZ4EMAQIBMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuZ2FuZGku
-bmV0L0dhbmRpU3RhbmRhcmRTU0xDQS5jcmwwagYIKwYBBQUHAQEEXjBcMDcG
-CCsGAQUFBzAChitodHRwOi8vY3J0LmdhbmRpLm5ldC9HYW5kaVN0YW5kYXJk
-U1NMQ0EuY3J0MCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5nYW5kaS5uZXQw
-JwYDVR0RBCAwHoILYml0bWFzay5uZXSCD3d3dy5iaXRtYXNrLm5ldDANBgkq
-hkiG9w0BAQUFAAOCAQEAM18EcHjjMaXOEbocHSWsZq4ZkaQY1MPraoSKCG9Z
-f1e4bIqpLQ02of1ql27wxP4gO/ymEUM8jGbq/y97NDQY16ngaeDI+DzJB5Rw
-PdWA8ed6TuKa/LFSiqmpJ0n2A5UpLPmjxDx0OSZpHac43NeKvxbyjg3iHPfC
-FQjSXVny78zyFIRgXNAap/X0ex6yi6vveYPjoNvPvFlm+XxkyTlMYfMxAcss
-bOx/R/wgkTVgJ/MXdw0iIeMtB0u+YzLNhACSiooj0zrxdes10hoW+dePt2iC
-pkvrC6lxFF1k9gialbL0xpmJ4RoN6au6GlEfFNJ7nKrXk/sco82IJ0bKolbI
-PA==
------END CERTIFICATE-----
+MIIE2TCCA8GgAwIBAgIQFJVNSYSLyYAUWJ3xw+zvODANBgkqhkiG9w0BAQUFADBB
+MQswCQYDVQQGEwJGUjESMBAGA1UEChMJR0FOREkgU0FTMR4wHAYDVQQDExVHYW5k
+aSBTdGFuZGFyZCBTU0wgQ0EwHhcNMTMxMDI0MDAwMDAwWhcNMTQxMDI0MjM1OTU5
+WjBWMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAsT
+EkdhbmRpIFN0YW5kYXJkIFNTTDEUMBIGA1UEAxMLYml0bWFzay5uZXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS/xaMkG69ubq1ZbvNzhCp8mySIAWo
+AXWTQR4xkao/ndW0KP07dX7wLUOk6xVEpk2zvaqtKuPXhufRvdwhSLIXQ8rL+3+p
+YRFhqkE2YnWm1RIOnrPLykZPc2CXSgSnPibLUEaaibQyPpneEC0WcUDjXrATLUav
+SWbp96X0E7boNU7XqPQnGuxONq9UBi8VeHzDbAl44fGIYBZWwsqb+pzL7WVKsxcX
+p+nw4+pauPr8Fk/oS8ygWejRugtjzRa40hmxHd4RtMR9qME7hgJOVz2EmF1mHxf8
+b4tKUVishc9SZoj7qHKSxvbCv4FZvmomECTBxkJUQm/rIq/akm2I1vrZAgMBAAGj
+ggG2MIIBsjAfBgNVHSMEGDAWgBS2qP+iqC/Qps1LsWjz51AQMad5ITAdBgNVHQ4E
+FgQUL3Hw7PloYPrsIDK66tzNDZn8SCswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGAGA1UdIARZMFcw
+SwYLKwYBBAGyMQECAhowPDA6BggrBgEFBQcCARYuaHR0cDovL3d3dy5nYW5kaS5u
+ZXQvY29udHJhY3RzL2ZyL3NzbC9jcHMvcGRmLzAIBgZngQwBAgEwPAYDVR0fBDUw
+MzAxoC+gLYYraHR0cDovL2NybC5nYW5kaS5uZXQvR2FuZGlTdGFuZGFyZFNTTENB
+LmNybDBqBggrBgEFBQcBAQReMFwwNwYIKwYBBQUHMAKGK2h0dHA6Ly9jcnQuZ2Fu
+ZGkubmV0L0dhbmRpU3RhbmRhcmRTU0xDQS5jcnQwIQYIKwYBBQUHMAGGFWh0dHA6
+Ly9vY3NwLmdhbmRpLm5ldDAnBgNVHREEIDAeggtiaXRtYXNrLm5ldIIPd3d3LmJp
+dG1hc2submV0MA0GCSqGSIb3DQEBBQUAA4IBAQCHDgSvPY6zxUCDaKfezZ5l5IWn
+5T/nJVs2RPWG1LLVr3Xoco2qbjZaolSJoUVOIKtSeYIi3YuXtvDZh6EVK83sCSer
+mduo82EcTg/E3j3r2vH0hyKs5VIjR8Jq8e9EcNh637UkdPBmTywRB+Oh4XwWVVjH
+6LcUx0XXTHeqD/O6Ip3Qe6kmONmsvURl5w00Vv9hscAGDge6Gz+8A9gaNmmOMJ97
+VzWgPNIivu2AT3+teVeWorSpJWFr4q6Ypns0rNvRLOglwXVfpvmNIGoEqJwRSs7I
+b3oFkGua43gND4zA/ufemun6/Vr7zc0lzhgOMyz+9u83r7Jiwbaxcg0agGBt
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/files/cert/bitmask.net.csr b/files/cert/bitmask.net.csr
index 46d2943..e7245e1 100644
--- a/files/cert/bitmask.net.csr
+++ b/files/cert/bitmask.net.csr
@@ -1,22 +1,15 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIDmDCCAeoCADAoMRAwDgYDVQQKDAdCaXRtYXNrMRQwEgYDVQQDDAtiaXRtYXNr
-Lm5ldDCCAbgwDQYJKoZIhvcNAQEBBQADggGlADCCAaACggGXAKXApDgMloyuVJSF
-mX26h3TgR5+iLnjuTZJDPSrtfNlJPUzuLbPmVyAsfcNgF5jqtVxr6ZNsoF68haBh
-WelAZAzCtXqABxtmK3PAVzD+fp7bFFyZczeE1SQY0tLKxWjcIkT2/mhs4xnkiVDS
-e7izyH49mZxRfPyVtpZ0QBqxgupgrmpdkJkixVehG4GpZmJsO7iQmUzIlIAy7QvM
-PNaxmCraPQ75FKxfzWOWmrKHSCfeVJDBu4lBLELEPAz10b1FLE8Gib+gsvJQ7Mgu
-/K0h5giFoynzSEaCxUY+X31eNTOAKEjD1PwcLosf8/0Ur/tqVEBecYYbX983jKMx
-zvfcIaW9WBjzV5KH/Im0otJ3dGz4Oh+bWR58KHAbflyf3tPU551hlFh80Yn98iSO
-5ell47kja/DZMPxbo3jbVHEbTeT+9HYVJOzu5Qw9qHiXUBZyMgDi9n7E+iklIEsK
-UFMfY0/N62c7NY/tSydFDnuu73ZByl5G50bjhnBtNmBi0KcTtW5BXQfhl62sODt3
-8yAcvvY6GSYuDDcCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBlwCDNEHvbLwhvwiU
-9h3/xwSbZAHRP8nrXRG3wY5I26FS2U6Iri4zCrsvyso1Ojr3V+tb0nCH7/+6dPWK
-k1GDzTvZ9PKtnttLROaNZ/fCd/lpcMtbQgo4fx2IjIJBi7eJBDmBoL8Ln5vCuCVk
-4v3wXRfdLqc+fpt4pPaMA/hTEGvnRPNaIxfR411dD21XzhBcVuxZ2bNAcAzuD3Wg
-IRArNosbLYRgJVukPmF34BfEY7R8jvdhlWB13vSuKVeDDOwSU0IRW5vfp4Am2Knb
-ZDohFbWG/7/VBKUryDJ1dJHKmyu1liu9gojyw3r+gHOgQLPb4mAPQd6CoyKghfM6
-TOVMGlEveyFGs9RafXSaqst2aGWdRh0OoF7rX2EqCTvzaHk6YOIJIf6BV2LSBmPr
-d6IOmoAjnqpMXwmVE7E0o3jr1CZ8WA0TwJvM794e2JqpK02+qsYiRAjq1Jj/I8Yh
-IwRQ89C0RfaOclJkO5XRL1gFADTsEs5gGnCFL1irlk4QPL4MXacG9AfxaXYta44g
-rUWkS3EIbVoCZuGX
+MIICbDCCAVQCADAoMRAwDgYDVQQKDAdCaXRtYXNrMRQwEgYDVQQDDAtiaXRtYXNr
+Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANL/FoyQbr25urVl
+u83OEKnybJIgBagBdZNBHjGRqj+d1bQo/Tt1fvAtQ6TrFUSmTbO9qq0q49eG59G9
+3CFIshdDysv7f6lhEWGqQTZidabVEg6es8vKRk9zYJdKBKc+JstQRpqJtDI+md4Q
+LRZxQONesBMtRq9JZun3pfQTtug1Tteo9Cca7E42r1QGLxV4fMNsCXjh8YhgFlbC
+ypv6nMvtZUqzFxen6fDj6lq4+vwWT+hLzKBZ6NG6C2PNFrjSGbEd3hG0xH2owTuG
+Ak5XPYSYXWYfF/xvi0pRWKyFz1JmiPuocpLG9sK/gVm+aiYQJMHGQlRCb+sir9qS
+bYjW+tkCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQCJZ2s+ZCebL0sFYe1TpRSX
+epTRCrZ/Y+YBbqXmleowUN+uPxiR6R+0+eMnwQnQmmFC189J/DrAJ8Q2BpCdmy5K
+8k4ksaAS/3HtNUaqv+bNb9SMr2jz648zQrZyp/tfHaozqoj77lqgt/xrI1WzzATz
+nGGsaSMaNgEAefS2hzb8rYY3KnCVNapj/A1eqpyfROy4uQI/Lgiy0omXEpTVIwen
+Sjjqk4ExtdxTcmSY9mzGW+lNAbSIy3Bqr1Zi+uBHNuEs4Kc4QbrivB2TazXXcNWb
+a5aQHL3zZdVD30YGjbmW66HVZPjvrkOTqJhDuKs15sg0HzFC2MWWqGveiPBTrKSc
 -----END CERTIFICATE REQUEST-----
diff --git a/files/cert/bitmask.net.key b/files/cert/bitmask.net.key
index 52529a4..f8339cd 100644
--- a/files/cert/bitmask.net.key
+++ b/files/cert/bitmask.net.key
@@ -1,41 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIHRgIBAAKCAZcApcCkOAyWjK5UlIWZfbqHdOBHn6IueO5NkkM9Ku182Uk9TO4t
-s+ZXICx9w2AXmOq1XGvpk2ygXryFoGFZ6UBkDMK1eoAHG2Yrc8BXMP5+ntsUXJlz
-N4TVJBjS0srFaNwiRPb+aGzjGeSJUNJ7uLPIfj2ZnFF8/JW2lnRAGrGC6mCual2Q
-mSLFV6EbgalmYmw7uJCZTMiUgDLtC8w81rGYKto9DvkUrF/NY5aasodIJ95UkMG7
-iUEsQsQ8DPXRvUUsTwaJv6Cy8lDsyC78rSHmCIWjKfNIRoLFRj5ffV41M4AoSMPU
-/Bwuix/z/RSv+2pUQF5xhhtf3zeMozHO99whpb1YGPNXkof8ibSi0nd0bPg6H5tZ
-HnwocBt+XJ/e09TnnWGUWHzRif3yJI7l6WXjuSNr8Nkw/FujeNtUcRtN5P70dhUk
-7O7lDD2oeJdQFnIyAOL2fsT6KSUgSwpQUx9jT83rZzs1j+1LJ0UOe67vdkHKXkbn
-RuOGcG02YGLQpxO1bkFdB+GXraw4O3fzIBy+9joZJi4MNwIDAQABAoIBlmwwbsAq
-70WKMKj0/zgCvZG7JuT6fizvFvDmNJHFi91kIcAKIwiuy6WzhK83FI/6e0CFK2PP
-3mmX0fzaLk7Cecued8gqsvjeWnRmUkMnikx0ITlD6+GMMXcrQMjYE7ybGz86nNpa
-YG2xLzPy/1CTAMXtvUs8IUHZEuHnpUQHI7WKP64rvktGV9sXzJV4ldyeWujgcT+e
-GNgI5ZLyz68vImyuIHaafDT7H1vmnLj09lMXmskVuywevx4hajTnauyIryAx202a
-PdNOoQ8UF2LO/Yj6dBtCmbk7sz/sHkXo85l4+Aa+VKMg5JZZcz6jSIJVpFbtXdM0
-9u+1xvtB8PmJA1aEEGafGHGMqa8/ar/K+VnQfgkgIFU0M0ebOCChI1LQc/8KNwoU
-LIghIGYcfVXtv4WJ5SWdmBd15UMMVtuZx/ibblpzaRjKoBoo035gzONr2nQHeItP
-dHrzX/l+9PFyEbqYUDY1quSW8klijaDO69GmKLvxS054MZcRpSNay2lyObb25t4O
-Nm7fVY7KNwWSvAov/qIVc/kCgcwA0b4VrYt7Z4gD4tsJzeL5DM5f7Y7g7D/d4vf7
-Ul2JQmw3bGRSCtC/z5Ld1x1HaLluugs7U1Ey2zzx5oQniwKJF7LbYcrezXNmWT7V
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/provider.json b/provider.json
index 03357fe..8cf6f0a 100644
--- a/provider.json
+++ b/provider.json
@@ -19,5 +19,11 @@
   },
   "service": {
     "allow_anonymous": true
+  },
+  "ca": {
+    "server_certificates": {
+//      not support by gandi:
+//      "bit_size": 3248
+    }
   }
 }