diff options
| author | cyberta <cyberta@riseup.net> | 2022-01-31 10:09:04 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-01-31 10:09:04 +0000 |
| commit | dd61a0cd00433d13b1682a9f848365d55076987b (patch) | |
| tree | c7d811090f46dbb0bf02b34ec9e06f3837e7825b /app | |
| parent | d5b1f44804083db32493ac6b7db3c71131f91ce3 (diff) | |
| parent | 6c166571f9ec6423873c17261b76999fdab6ab40 (diff) | |
Merge branch 'calyx_ca' into 'master'
add new ca cert for calyx
Closes #9063
See merge request leap/bitmask_android!166
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/custom/assets/riseup.net.json | 2 | ||||
| -rw-r--r-- | app/src/custom/assets/riseup.net.pem | 12 | ||||
| -rw-r--r-- | app/src/normal/assets/calyx.net.json | 2 | ||||
| -rw-r--r-- | app/src/normal/assets/calyx.net.pem | 12 | ||||
| -rw-r--r-- | app/src/normal/assets/riseup.net.json | 2 |
5 files changed, 25 insertions, 5 deletions
diff --git a/app/src/custom/assets/riseup.net.json b/app/src/custom/assets/riseup.net.json index cc8ad183..dac08bc2 100644 --- a/app/src/custom/assets/riseup.net.json +++ b/app/src/custom/assets/riseup.net.json @@ -1,7 +1,7 @@ { "api_uri": "https://api.black.riseup.net:443", "api_version": "3", - "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494", + "ca_cert_fingerprint": "SHA256: dd919b7513b4a1368faa20e38cd3314156805677f48b787cdd9b4a92dec64eb0", "ca_cert_uri": "https://black.riseup.net/ca.crt", "default_language": "en", "description": { diff --git a/app/src/custom/assets/riseup.net.pem b/app/src/custom/assets/riseup.net.pem index c890aff4..8c7ad4e4 100644 --- a/app/src/custom/assets/riseup.net.pem +++ b/app/src/custom/assets/riseup.net.pem @@ -29,4 +29,14 @@ tsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF tGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ UN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp 0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO ------END CERTIFICATE-----
\ No newline at end of file +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBYjCCAQigAwIBAgIBATAKBggqhkjOPQQDAjAXMRUwEwYDVQQDEwxMRUFQIFJv +b3QgQ0EwHhcNMjExMTAyMTkwNTM3WhcNMjYxMTAyMTkxMDM3WjAXMRUwEwYDVQQD +EwxMRUFQIFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQxOXBGu+gf +pjHzVteGTWL6XnFxtEnKMFpKaJkA/VOHmESzoLsZRQxt88GssxaqC01J17idQiqv +zgNpedmtvFtyo0UwQzAOBgNVHQ8BAf8EBAMCAqQwEgYDVR0TAQH/BAgwBgEB/wIB +ATAdBgNVHQ4EFgQUZdoUlJrCIUNFrpffAq+LQjnwEz4wCgYIKoZIzj0EAwIDSAAw +RQIgfr3w4tnRG+NdI3LsGPlsRktGK20xHTzsB3orB0yC6cICIQCB+/9y8nmSStfN +VUMUyk2hNd7/kC8nL222TTD7VZUtsg== +-----END CERTIFICATE----- diff --git a/app/src/normal/assets/calyx.net.json b/app/src/normal/assets/calyx.net.json index 1e3a9e7b..e3680dee 100644 --- a/app/src/normal/assets/calyx.net.json +++ b/app/src/normal/assets/calyx.net.json @@ -1,7 +1,7 @@ { "api_uri": "https://api.calyx.net:4430", "api_version": "1", - "ca_cert_fingerprint": "SHA256: 43683c9ba3862c5384a8c1885072fcac40b5d2d4dd67331443f13a3077fa2e69", + "ca_cert_fingerprint": "SHA256: b2ae8b075a0e5634160c4dceec2e651dfabf9e4ea9409cc896cd2e1054c92372", "ca_cert_uri": "https://calyx.net/ca.crt", "default_language": "en", "description": { diff --git a/app/src/normal/assets/calyx.net.pem b/app/src/normal/assets/calyx.net.pem index cedb2e38..7ab33cdf 100644 --- a/app/src/normal/assets/calyx.net.pem +++ b/app/src/normal/assets/calyx.net.pem @@ -28,4 +28,14 @@ X6VIs4U8wOotgljzX/CSpKqlxcqZjhnAuelZ1+KiN8RHKPj7AzSLYOv/YwTjLTIq EOxquoNR58uDa5pBG22a7xWbSaKosn/mEl8SrUr6klzzc8Vh09IMoxrw74uLdAg2 1jnrhm7qg91Ttb0aXiqbV+Kg/qQzojdewnnoBFnv4jaQ3y8zDCfMhsBtWlWz4Knb Zqga1WyRm3Gj1j6IV0oOincYMrw5YA7bgXpwop/Lo/mmliMA14ps ------END CERTIFICATE-----
\ No newline at end of file +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIBYjCCAQigAwIBAgIBATAKBggqhkjOPQQDAjAXMRUwEwYDVQQDEwxMRUFQIFJv +b3QgQ0EwHhcNMjIwMTI1MjAwODQ4WhcNMjcwMTI1MjAxMzQ4WjAXMRUwEwYDVQQD +EwxMRUFQIFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR5sb4Lwq77 +09TgMRcZWuzgeSI4/oCBynRt6aDiMMMcbEqRbp968UT+1swcsoPmMBBm0YhODPWb +8o55JCJcyMfro0UwQzAOBgNVHQ8BAf8EBAMCAqQwEgYDVR0TAQH/BAgwBgEB/wIB +ATAdBgNVHQ4EFgQU64nDDTqCutWEISvwMgXNfSjqOXUwCgYIKoZIzj0EAwIDSAAw +RQIgQIccvto5OJ1GA3u3sZ2v8XRXvCpeZ3GnIKld9VFHSIcCIQDjhOmkF7y2jeAA +MwurWljzGRHJqBJwHdNVQQlxbUMfxA== +-----END CERTIFICATE----- diff --git a/app/src/normal/assets/riseup.net.json b/app/src/normal/assets/riseup.net.json index 7c5bc6d0..b72091b4 100644 --- a/app/src/normal/assets/riseup.net.json +++ b/app/src/normal/assets/riseup.net.json @@ -1,7 +1,7 @@ { "api_uri": "https://api.black.riseup.net:443", "api_version": "3", - "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494", + "ca_cert_fingerprint": "SHA256: dd919b7513b4a1368faa20e38cd3314156805677f48b787cdd9b4a92dec64eb0", "ca_cert_uri": "https://black.riseup.net/ca.crt", "default_language": "en", "description": { |