|
 |
e7f1a6 |
From 56a34073c6dd8a775b9187decb17d8c552cbfd5b Mon Sep 17 00:00:00 2001
|
|
|
e7f1a6 |
From: Martin Kutlak <mkutlak@redhat.com>
|
|
|
e7f1a6 |
Date: Thu, 11 Jan 2018 16:43:40 +0100
|
|
|
e7f1a6 |
Subject: [PATCH] reporter-rhtsupport: remove dependency of
|
|
|
e7f1a6 |
redhat-access-insights
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
The package is going away/will no longer include the certificate.
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
Libreport will package the certificate directly.
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
Related to #1524481
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
|
|
|
e7f1a6 |
---
|
|
|
e7f1a6 |
src/lib/ureport.c | 2 +-
|
|
|
e7f1a6 |
src/plugins/Makefile.am | 4 ++
|
|
|
e7f1a6 |
src/plugins/cert-api.access.redhat.com.pem | 74 ++++++++++++++++++++++++++++++
|
|
|
e7f1a6 |
4 files changed, 80 insertions(+), 2 deletions(-)
|
|
|
e7f1a6 |
create mode 100644 src/plugins/cert-api.access.redhat.com.pem
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
|
|
e7f1a6 |
index f89fe62..490b75c 100644
|
|
|
e7f1a6 |
--- a/src/lib/ureport.c
|
|
|
e7f1a6 |
+++ b/src/lib/ureport.c
|
|
|
e7f1a6 |
@@ -41,7 +41,7 @@
|
|
|
e7f1a6 |
* macro for cert name. Cert path can be easily modified for example by reading
|
|
|
e7f1a6 |
* an environment variable LIBREPORT_DEBUG_AUTHORITY_CERT_DIR_PATH
|
|
|
e7f1a6 |
*/
|
|
|
e7f1a6 |
-#define CERT_AUTHORITY_CERT_PATH "/etc/redhat-access-insights"
|
|
|
e7f1a6 |
+#define CERT_AUTHORITY_CERT_PATH "/etc/libreport"
|
|
|
e7f1a6 |
#define CERT_AUTHORITY_CERT_NAME "cert-api.access.redhat.com.pem"
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
static char *
|
|
|
e7f1a6 |
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
|
|
|
e7f1a6 |
index c5e8ec1..ec10a81 100644
|
|
|
e7f1a6 |
--- a/src/plugins/Makefile.am
|
|
|
e7f1a6 |
+++ b/src/plugins/Makefile.am
|
|
|
e7f1a6 |
@@ -22,6 +22,10 @@ pluginsconfdir = $(PLUGINS_CONF_DIR)
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
|
|
|
e7f1a6 |
|
|
|
e7f1a6 |
+libreportconfdir = $(CONF_DIR)
|
|
|
e7f1a6 |
+dist_libreportconf_DATA = \
|
|
|
e7f1a6 |
+ cert-api.access.redhat.com.pem
|
|
|
e7f1a6 |
+
|
|
|
e7f1a6 |
reporters_plugin_conf =
|
|
|
e7f1a6 |
reporters_plugin_format_conf =
|
|
|
e7f1a6 |
if BUILD_BUGZILLA
|
|
|
e7f1a6 |
diff --git a/src/plugins/cert-api.access.redhat.com.pem b/src/plugins/cert-api.access.redhat.com.pem
|
|
|
e7f1a6 |
new file mode 100644
|
|
|
e7f1a6 |
index 0000000..20ef8c0
|
|
|
e7f1a6 |
--- /dev/null
|
|
|
e7f1a6 |
+++ b/src/plugins/cert-api.access.redhat.com.pem
|
|
|
e7f1a6 |
@@ -0,0 +1,74 @@
|
|
|
e7f1a6 |
+-----BEGIN CERTIFICATE-----
|
|
|
e7f1a6 |
+MIIHZDCCBUygAwIBAgIJAOb+QiglyeZeMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
|
|
|
e7f1a6 |
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
|
|
|
e7f1a6 |
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
|
|
|
e7f1a6 |
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
|
|
|
e7f1a6 |
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTAwMzE3MTkwMDQ0WhcNMzAw
|
|
|
e7f1a6 |
+MzEyMTkwMDQ0WjCBsDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9s
|
|
|
e7f1a6 |
+aW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgw
|
|
|
e7f1a6 |
+FgYDVQQLDA9SZWQgSGF0IE5ldHdvcmsxHjAcBgNVBAMMFUVudGl0bGVtZW50IE1h
|
|
|
e7f1a6 |
+c3RlciBDQTEkMCIGCSqGSIb3DQEJARYVY2Etc3VwcG9ydEByZWRoYXQuY29tMIIC
|
|
|
e7f1a6 |
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2Z+mW7OYcBcGxWS+RSKG2GJ2
|
|
|
e7f1a6 |
+csMXiGGfEp36vKVsIvypmNS60SkicKENMYREalbdSjrgfXxPJygZWsVWJ5lHPfBV
|
|
|
e7f1a6 |
+o3WkFrFHTIXd/R6LxnaHD1m8Cx3GwEeuSlE/ASjc1ePtMnsHH7xqZ9wdl85b1C8O
|
|
|
e7f1a6 |
+scgO7fwuM192kvv/veI/BogIqUQugtG6szXpV8dp4ml029LXFoNIy2lfFoa2wKYw
|
|
|
e7f1a6 |
+MiUHwtYgAz7TDY63e8qGhd5PoqTv9XKQogo2ze9sF9y/npZjliNy5qf6bFE+24oW
|
|
|
e7f1a6 |
+E8pGsp3zqz8h5mvw4v+tfIx5uj7dwjDteFrrWD1tcT7UmNrBDWXjKMG81zchq3h4
|
|
|
e7f1a6 |
+etgF0iwMHEuYuixiJWNzKrLNVQbDmcLGNOvyJfq60tM8AUAd72OUQzivBegnWMit
|
|
|
e7f1a6 |
+CLcT5viCT1AIkYXt7l5zc/duQWLeAAR2FmpZFylSukknzzeiZpPclRziYTboDYHq
|
|
|
e7f1a6 |
+revM97eER1xsfoSYp4mJkBHfdlqMnf3CWPcNgru8NbEPeUGMI6+C0YvknPlqDDtU
|
|
|
e7f1a6 |
+ojfl4qNdf6nWL+YNXpR1YGKgWGWgTU6uaG8Sc6qGfAoLHh6oGwbuz102j84OgjAJ
|
|
|
e7f1a6 |
+DGv/S86svmZWSqZ5UoJOIEqFYrONcOSgztZ5tU+gP4fwRIkTRbTEWSgudVREOXhs
|
|
|
e7f1a6 |
+bfN1YGP7HYvS0OiBKZUCAwEAAaOCAX0wggF5MB0GA1UdDgQWBBSIS6ZFxEbsj9bP
|
|
|
e7f1a6 |
+pvYazyY8kMx/FzCB5QYDVR0jBIHdMIHagBSIS6ZFxEbsj9bPpvYazyY8kMx/F6GB
|
|
|
e7f1a6 |
+tqSBszCBsDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAw
|
|
|
e7f1a6 |
+DgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgwFgYDVQQL
|
|
|
e7f1a6 |
+DA9SZWQgSGF0IE5ldHdvcmsxHjAcBgNVBAMMFUVudGl0bGVtZW50IE1hc3RlciBD
|
|
|
e7f1a6 |
+QTEkMCIGCSqGSIb3DQEJARYVY2Etc3VwcG9ydEByZWRoYXQuY29tggkA5v5CKCXJ
|
|
|
e7f1a6 |
+5l4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgEG
|
|
|
e7f1a6 |
+MCAGA1UdEQQZMBeBFWNhLXN1cHBvcnRAcmVkaGF0LmNvbTAgBgNVHRIEGTAXgRVj
|
|
|
e7f1a6 |
+YS1zdXBwb3J0QHJlZGhhdC5jb20wDQYJKoZIhvcNAQEFBQADggIBAJ1hEdNBDTRr
|
|
|
e7f1a6 |
+6kI6W6stoogSUwjuiWPDY8DptwGhdpyIfbCoxvBR7F52DlwyXOpCunogfKMRklnE
|
|
|
e7f1a6 |
+gH1Wt66RYkgNuJcenKHAhR5xgSLoPCOVF9rDjMunyyBuxjIbctM21R7BswVpsEIE
|
|
|
e7f1a6 |
+OpV5nlJ6wkHsrn0/E+Zk5UJdCzM+Fp4hqHtEn/c97nvRspQcpWeDg6oUvaJSZTGM
|
|
|
e7f1a6 |
+8yFpzR90X8ZO4rOgpoERukvYutUfJUzZuDyS3LLc6ysamemH93rZXr52zc4B+C9G
|
|
|
e7f1a6 |
+Em8zemDgIPaH42ce3C3TdVysiq/yk+ir7pxW8toeavFv75l1UojFSjND+Q2AlNQn
|
|
|
e7f1a6 |
+pYkmRznbD5TZ3yDuPFQG2xYKnMPACepGgKZPyErtOIljQKCdgcvb9EqNdZaJFz1+
|
|
|
e7f1a6 |
+/iWKYBL077Y0CKwb+HGIDeYdzrYxbEd95YuVU0aStnf2Yii2tLcpQtK9cC2+DXjL
|
|
|
e7f1a6 |
+Yf3kQs4xzH4ZejhG9wzv8PGXOS8wHYnfVNA3+fclDEQ1mEBKWHHmenGI6QKZUP8f
|
|
|
e7f1a6 |
+g0SQ3PNRnSZu8R+rhABOEuVFIBRlaYijg2Pxe0NgL9FlHsNyRfo6EUrB2QFRKACW
|
|
|
e7f1a6 |
+3Mo6pZyDjQt7O8J7l9B9IIURoJ1niwygf7VSJTMl2w3fFleNJlZTGgdXw0V+5g+9
|
|
|
e7f1a6 |
+Kg6Ay0rrsi4nw1JHue2GvdjdfVOaWSWC
|
|
|
e7f1a6 |
+-----END CERTIFICATE-----
|
|
|
e7f1a6 |
+-----BEGIN CERTIFICATE-----
|
|
|
e7f1a6 |
+MIIFfTCCA2WgAwIBAgIJAJGKz8qFAAADMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
|
|
|
e7f1a6 |
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
|
|
|
e7f1a6 |
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
|
|
|
e7f1a6 |
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
|
|
|
e7f1a6 |
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTUwNTA1MTMwMzQ4WhcNMjUw
|
|
|
e7f1a6 |
+NTAyMTMwMzQ4WjCBiTELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5PUlRIIENBUk9M
|
|
|
e7f1a6 |
+SU5BMRAwDgYDVQQHEwdSYWxlaWdoMRAwDgYDVQQKEwdSZWQgSGF0MRgwFgYDVQQL
|
|
|
e7f1a6 |
+Ew9SZWQgSGF0IE5ldHdvcmsxIzAhBgNVBAMTGmNlcnQtYXBpLmFjY2Vzcy5yZWRo
|
|
|
e7f1a6 |
+YXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9hTNMtZMa7Kg
|
|
|
e7f1a6 |
+Jlux6pnuUinP0Rv0aiiPFr7qNHFore4loGrPlpzUvQbUByy3xm7lhf4R4qbINCls
|
|
|
e7f1a6 |
+veWg6HDidvQr174RXb5YLMXuBrYAiPWQTrRRLNuvXFHKzREghRWTv48IXTIDEo0G
|
|
|
e7f1a6 |
+fZJUO+myY2RfwqugZKic5dR6ZakHSSpQO70O6H5R0eHlKa13k4eEpG2fVY/xqFto
|
|
|
e7f1a6 |
+WkfZyEmSacZpqxp7gIjZqreLc4MFwpiVjGFrK3Jk+Px1Z6J94LTLx2SxrYzWIeUs
|
|
|
e7f1a6 |
+5j+lceQOvpV4/pkClnRCW1pkCKTccjFKQkpNPGwdIusRXUGl9IYc20Fa/7g9iUQc
|
|
|
e7f1a6 |
+5fXu9EAzfwIDAQABo4G+MIG7MAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
|
|
|
e7f1a6 |
+MAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcDATA5BglghkgBhvhCAQ0E
|
|
|
e7f1a6 |
+LBYqTWFuYWdlZCBieSBSZWQgSGF0IChjYS1zdXBwb3J0QHJlZGhhdC5jb20pMB0G
|
|
|
e7f1a6 |
+A1UdDgQWBBRfgCjd8aXf0U4VX8DKTVIn+paGBzAfBgNVHSMEGDAWgBSIS6ZFxEbs
|
|
|
e7f1a6 |
+j9bPpvYazyY8kMx/FzANBgkqhkiG9w0BAQUFAAOCAgEAlC+r6UEEp5BUkI0Rj2T+
|
|
|
e7f1a6 |
+1PH7oUCaGQeQoyVbGddz/WUcBk/lMMtyCEoxU+3tTwNWmCWWjYXtjoL9MlSAC/q+
|
|
|
e7f1a6 |
+NZfBi1iq0uuSus9JI/Uu8aRhoxTK56qGRed/JNixOHEmFn891cahIPpF0exWwtYD
|
|
|
e7f1a6 |
+ThwXo7Z6PI7t8EMKdSrGTOowp58yho8xYFL/Z7JmjL55Pf85GIrdiniNZd4i178J
|
|
|
e7f1a6 |
+07R9zsiLvdXq9mT33iJwkm+uhO+FA9d8OE3ji21pBbGUAQSWOdkemvUCsy8zANW9
|
|
|
e7f1a6 |
+fT+dBrMr5Buk7eaBBJ2PxECNiWLCRQJWmyff1O5zMT0daS2lBdEGUNhBZ0hnX13Q
|
|
|
e7f1a6 |
+kabUp0bxRrNRq+WkomP7onZhfZS6SjKm0UmwoV6o3V1ED6y7muQNRmgDpA5PcbvO
|
|
|
e7f1a6 |
+gl7OexNL4zcpyfMdAmTYf5yTRSvB42Yg5hVfuzPEnOIqupwES3mWkEHRlqbMUkHw
|
|
|
e7f1a6 |
+qIQAxIwQqZd5PdPpElQ/6j/ZT9DwW/I6zgndX2rsS0oGYcwFTkSj0/rKKkC13hk7
|
|
|
e7f1a6 |
+LchXMZu5ckdustM79U6OZIBairrJaL2OpR08un2nwIjgEGqhVFYc44UK1VpkE8mr
|
|
|
e7f1a6 |
+qvqJS6OHVlTlKcEDnhVkPS3i5qjuS/PtSq0CwH8bzYKFJayLDY/z36Zv6PdttzmU
|
|
|
e7f1a6 |
+Yb1NSDcJejHJ80pMINutyYQ=
|
|
|
e7f1a6 |
+-----END CERTIFICATE-----
|
|
|
e7f1a6 |
--
|
|
|
e7f1a6 |
2.14.3
|
|
|
e7f1a6 |
|