Merge "Update AAI certs to expiry 27 Mar 2021"

2 files changed, 57 insertions, 53 deletions

diff --git a/resources/config/aai/aai_keystore b/resources/config/aai/aai_keystore
index f5a80d8..d1ebae8 100644
--- a/resources/config/aai/aai_keystore
+++ b/resources/config/aai/aai_keystore
diff --git a/resources/config/haproxy/aai.pem b/resources/config/haproxy/aai.pem
index 22779a7..6390db1 100644
--- a/resources/config/haproxy/aai.pem
+++ b/resources/config/haproxy/aai.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFJTCCBA2gAwIBAgIIJpgs+ja+zwYwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
+MIIFKzCCBBOgAwIBAgIILW/fiLbps3kwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
 BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp
-bnRlcm1lZGlhdGVDQV85MB4XDTE5MDkyNzE5MzQ1NFoXDTIwMDkyNzE5MzQ1NFow
-gY4xETAPBgNVBAMMCGFhaS5vbmFwMS4wLAYJKoZIhvcNAQkBFh9tYXJrLmQubWFu
-YWdlckBwZW9wbGUub3NhYWYuY29tMR0wGwYDVQQLDBRhYWlAYWFpLm9uYXAub3Jn
-OkRFVjEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVT
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1KCd/hI7j0CSfWqCbPfM
-KZCCbOgLxFe16QMYk8m4hiuEd53B0Mm/M0tcDpHp51OwvAt5UCNzsa5MRJg5Tg1j
-XLZ+m1/xN+2D8D+iMp+0AfQt2iTEct9LpA5axAPBxmwGlCsrLv8iQBOmlJn4SXVl
-TjSPwstTL3OhKKM5nflGSjhyksKvY72BpLZUmaktTB2rlVis3lYGp4Pp6MtEKnZM
-s4M9albu+L4sbDGIudkvmqmyohT6hSL7L1Px+YoL5DrRAdOrogIqkdhCUMm3mXLY
-vWoXOLzuZ27bTTHZM7E5NP8S5Ko9LH7Ryv6zBAzDsxYsE+NE5ujVCY9sLq5D972x
-WwIDAQABo4IByzCCAccwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwIAYDVR0l
-AQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRNMEuAFIH3mVsQuciM
-3vNSXupOaaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05B
-UDELMAkGA1UEBhMCVVOCAQcwHQYDVR0OBBYEFJHb/F7Oi9y8mo6oqhVcRmFDZO6W
-MIIBEQYDVR0RBIIBCDCCAQSCCGFhaS5vbmFwghJhYWktc3Bhcmt5LWJlLm9uYXCC
-G2FhaS5hcGkuc2ltcGxlZGVtby5vbmFwLm9yZ4IlYWFpLmVsYXN0aWNzZWFyY2gu
-c2ltcGxlZGVtby5vbmFwLm9yZ4IlYWFpLmdyZW1saW5zZXJ2ZXIuc2ltcGxlZGVt
-by5vbmFwLm9yZ4IdYWFpLmhiYXNlLnNpbXBsZWRlbW8ub25hcC5vcmeCJWFhaS5z
-ZWFyY2hzZXJ2aWNlLnNpbXBsZWRlbW8ub25hcC5vcmeCF2FhaS5zaW1wbGVkZW1v
-Lm9uYXAub3JnghphYWkudWkuc2ltcGxlZGVtby5vbmFwLm9yZzANBgkqhkiG9w0B
-AQsFAAOCAQEAOFC1zeyuRIzK0DfCUUAOacPlK5MD2uiDt+eSeOLIIb34MCITBhSq
-5fhrXJwaXULzKS+w/mJWqo6HDyD7xefz05jfnEi4g1BRzll7kMbtyl88rQp6jRwu
-Qr9L/DtYcGWgYgwpsKIncIh/ikFEPqbmbKcAfISCDptbHTQm29QEbjCSp9crQncr
-z24aaBRjYAUW9AtNLWh+lmZSIMmtynR/xSWGuo+Js8Ab6h7g0uk5qXIPwEHs4E1G
-StvMIohRbecvpWfg98zysA1hELkdZHxzyKXVHq8fSxfosi/xK43JuAN6SrJz5Ja3
-C297UuKJOw7EaMzOMLML4ylBIWs8x0JB6g==
+bnRlcm1lZGlhdGVDQV85MB4XDTIwMDMxNzIwMjg1NloXDTIxMDMxNzIwMjg1Nlow
+WTEMMAoGA1UEAwwDYWFpMR0wGwYDVQQLDBRhYWlAYWFpLm9uYXAub3JnOkRFVjEO
+MAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAov4ddmOzRCWAU/sx2Q9kcYZZ0r/x
+agqwDBcmlS2OP0MAou/f/xY2gzE2ugXXGGEXG6PCUx4YEHGeRxyezEQ/+c+kSjFe
+0FTUa8Z1Ojad3VDsJfjfZ1994NpV99KTrrw1Twq9Ei7dpkypUA8kZxEjg7eM11TU
+F4jS6x5NEyVsxih5uJjIF7ErGwimSEKsympcsXezYgG9Z/VPBpZWmYlYl5MWjzT6
+F0FgGfSbajWauMifEPajmvn8ZXn6Lyx0RCI25+BCcOhS6UvYXFX+jE/uOoEbKgwz
+11tIdryEFrXiLVfD01uhacx02YCrzj1u53RWiD6bCPyatKo1hQsf+aDkEQIDAQAB
+o4ICBzCCAgMwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwIAYDVR0lAQH/BBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRNMEuAFIH3mVsQuciM3vNSXupO
+aaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05BUDELMAkG
+A1UEBhMCVVOCAQcwHQYDVR0OBBYEFP94WTftXhHcz93nBT6jIdMe6h+6MIIBTQYD
+VR0RBIIBRDCCAUCBH21hcmsuZC5tYW5hZ2VyQHBlb3BsZS5vc2FhZi5jb22CA2Fh
+aYIUYWFpLXNlYXJjaC1kYXRhLm9uYXCCEmFhaS1zcGFya3ktYmUub25hcIIbYWFp
+LmFwaS5zaW1wbGVkZW1vLm9uYXAub3JngiVhYWkuZWxhc3RpY3NlYXJjaC5zaW1w
+bGVkZW1vLm9uYXAub3JngiVhYWkuZ3JlbWxpbnNlcnZlci5zaW1wbGVkZW1vLm9u
+YXAub3Jngh1hYWkuaGJhc2Uuc2ltcGxlZGVtby5vbmFwLm9yZ4IIYWFpLm9uYXCC
+JWFhaS5zZWFyY2hzZXJ2aWNlLnNpbXBsZWRlbW8ub25hcC5vcmeCF2FhaS5zaW1w
+bGVkZW1vLm9uYXAub3JnghphYWkudWkuc2ltcGxlZGVtby5vbmFwLm9yZzANBgkq
+hkiG9w0BAQsFAAOCAQEAVigPPsYd8yscW+U6zpffBc5S6Mg2DQD/gikB0uF//lIq
+oa5qTI3yB0wPoRKmxpeEZiJYDkBs3App2sPM2fPb9GGmGncCLkprqTflM2Y4yxX4
+k/a7w8vEwMoCrBgxEdmniAj9TirsISyLqBIXoGT7WtaXBLZarYhJ4P7TplhyWuwe
+sV6jxkZLIRLj31ihf32adFIhPZQKxaHbbFnyEylLTdPuZGy3nvdmjajZuomOFF8h
+HhDIouSJAtgkuWVsMiX6iR1qG9//6ymnZMvUyDGr8bkZURhMqesAejwP4aKxqDZg
+B0uVjapQTJH4ES0M+2PoY9gP8uh0dc3TusOs1QYJiA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
@@ -54,31 +54,35 @@ uKKISHqVJuw/vXHl1jNibEo9+JuQ88VNuAcm7WpGUogeCa2iAlPTckPZei+MwZ8w
 tpvxTyYlZEC8DWzY1VC29+W2N5cvh01e2E3Ql08W1zL63dqrgdEZ3VWjzooYi4ep
 BmMXTvouW+Flyvcw/0oTcfN0biDIt0mCkZ5CQVjfGL9DTOYteR5hw+k=
 -----END CERTIFICATE-----
+Bag Attributes
+    friendlyName: aai@aai.onap.org
+    localKeyID: 54 69 6D 65 20 31 35 38 34 34 37 36 39 33 36 35 31 35 
+Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDUoJ3+EjuPQJJ9
-aoJs98wpkIJs6AvEV7XpAxiTybiGK4R3ncHQyb8zS1wOkennU7C8C3lQI3OxrkxE
-mDlODWNctn6bX/E37YPwP6Iyn7QB9C3aJMRy30ukDlrEA8HGbAaUKysu/yJAE6aU
-mfhJdWVONI/Cy1Mvc6Eoozmd+UZKOHKSwq9jvYGktlSZqS1MHauVWKzeVgang+no
-y0Qqdkyzgz1qVu74vixsMYi52S+aqbKiFPqFIvsvU/H5igvkOtEB06uiAiqR2EJQ
-ybeZcti9ahc4vO5nbttNMdkzsTk0/xLkqj0sftHK/rMEDMOzFiwT40Tm6NUJj2wu
-rkP3vbFbAgMBAAECggEBAM4iqQkYRAWtZFeSWr+pvJTPNKLAlCfVoNY12i3s8qeg
-qNwOZUg1Ttg7xxOZAlryF/U2anX26MLpZ6dYrLWu5RWNF1EqwoCmE7Nm/ah2i90Z
-DRrfalSzhnGWOQivW70yHW6oK0V0s4/LfUOzwbH1zjDzZCxFUnA+eY8cL0+nyy1H
-phUoW8EYUZXqVhtVgn3oBCcC54OLhefzS4zvpM9KV3WEwu0aSbaP8vA8ZYLuOZo/
-HWnFTJNDi+g140ZWo0BaCAix2ZFEAX9Gv/XnQw28mcLD8Cy0szW6AqHBBvff1hBR
-ivK5CDfFhZgrj/1cnp85Dy1PDzM20K0bQjUMT7rY64ECgYEA/09y2TjJ/QNWXXUt
-3mqenmLJRfwtKDRE81d2j8p2R+3rh9zn7frivYgw9KcKCN9OAnWG1LV6vjUuRAwD
-7pPHeqBsh9O2GV7/+CN0a0UFxlcIdulKRBAdHpuiNa+CxXMuv5K7hisI6nr3dzA7
-SSzkLFJe7mI7oZ0LQtrWpyjiAZcCgYEA1TOnDqrnEKkgnCf7Bttk3pdsVmsTff4z
-WEygxOIIwk543Bixw76C4ZPOuNKVqQ0A0qDX7/JGksziQ8PnCOoWV3cnLdmnNoMS
-1EebVo9ZxBMZSC5Kwqrx1yRtXxSgHdJJag9SVl2odORtcjOx5+CtM+JnBPU2Xy5z
-VpUW1fY2ft0CgYBCUuBR/8exO6m285br3aTBHoaM8LrGY/W5hXIeXoklnHAARmnV
-z8QRWozlMXOQ5Hm+d8uD/HUbbnNLaBepZah/eadYDa6TnrM+Qe+fYjni0X84bNhH
-ICyAZAvaiHKfWpG9YJ/odcuGJlWdF+F+2/OWc/uHT+uPy10+i90RZbR4lwKBgHTN
-F3ixqGU4QuVKAfx/tYM88d1mTAd6fCaj1HAIZUQOOaha3wieFpX+pAIdXGCA/zJl
-a+fIk2FZXZxCdxArLpI8dPppg3IZ3PbvQ+roHgWNcQxaUBrWDCgRjNnKMu4jhpTU
-UAeAyAlCG7O1HoIqVLlYD5hnvqHmkMmeZCRT/wcBAoGAU5xMksckNWvdz6D89BzY
-9a2bgcb0kRVbFicF4GleaheCKhiqtdrTxEiyg1ZwNWTcK/pN8ZSgjV7chs28lkPR
-uZFDLL6Y+ZZZaqY8hnTdaMHXVIg3revfUWYS5+Em+7ZxkofFLw4AuGoWKt354sug
-vM/Ukk+vi7GDiJIKsqWACFA=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCi/h12Y7NEJYBT
++zHZD2RxhlnSv/FqCrAMFyaVLY4/QwCi79//FjaDMTa6BdcYYRcbo8JTHhgQcZ5H
+HJ7MRD/5z6RKMV7QVNRrxnU6Np3dUOwl+N9nX33g2lX30pOuvDVPCr0SLt2mTKlQ
+DyRnESODt4zXVNQXiNLrHk0TJWzGKHm4mMgXsSsbCKZIQqzKalyxd7NiAb1n9U8G
+llaZiViXkxaPNPoXQWAZ9JtqNZq4yJ8Q9qOa+fxlefovLHREIjbn4EJw6FLpS9hc
+Vf6MT+46gRsqDDPXW0h2vIQWteItV8PTW6FpzHTZgKvOPW7ndFaIPpsI/Jq0qjWF
+Cx/5oOQRAgMBAAECggEAVYWGSf9IKYKP0gDkh+LmrhZzfPxPnHddJgrjqLSNha4P
+YG8CliK+mZmyAGteECGpcUw8g0YwFDi5dtCSldVdyCLmLjO3bxKDnsUz70aHEIAM
+WGQ8PE5Diz6kivMHoFCKnB2jVS4YCNECqco4LIg2nT8q/DU7T9nv6YQtptUlPNdY
+OmJRXfUfcBSUINqVi/VbEjHtbZqc6dgvaRNEF0CYtqHm7P51BXGa3pH+6drL+U+a
+o3T4yHrEsDKUaQzJZoiJneexwN91x42gcyHzg30UZVgCP+9Zt2GQWXqpENNZjGlI
+bwzouvBj266ViBNbuu3tar58MASOCnCKGA0Jrs3P3QKBgQD0ENenvzaqNzV0A47x
++RI76DM2eorY2dxh+4txAt1pXlkbMZuWXjs1ysBPYaGHZRitiCFcaSwdP2T0oCET
+ojYEU97bJkKlcuw2scAqznSi7U0uSaStwaWzEviGTsQ51MKghRESMfpt3BxZqyi0
+BV+fPeRk3l3xaw1AuZQ/JTn0qwKBgQCq9msPcbRzKvsmfsAVvjKAodzl6EaM+PcF
+YLnJLurjCtdyjj1lRaCBg9bRbaRbt9YPg4VA5oMYm2SuwbJQQHjqaeN+SpnV8GGc
+nPsZgoSlfZrnLovyGgC3muiA3uSPREZWUlp+IE8qlQ8VztSWkNyxNej4nhxk2UTH
+DOE2ZmNyMwKBgFD+yeKkZUrFuZp/l8+bfb6dx2kb77oZSrbFmLfvYHUYV2/b3atg
+KDwoxftSBh39odvs4k1dpcMrB6DbBz8RxOVYxAtsPg/T/KoGASTzkOeE4ukqjVkQ
+e6Ha+NjxiNM8VT6aCllEdrxAoLPtRju/0MTy8Dm9ReXZRfOl4pm2C+6zAoGAY2D6
+uu+NxaSmeaoUXo9BLCTrE3oCCNBwR2ACnz/2qiQTOTQV3FitBJxusy7Y67fhZwM8
+4o0ch6FM1Yki7iOMJjeHVlJnOkWReEiIbjvAf7KT6O7VytXytMgHf2IR2nYFrQgS
+Ml71pfsf2b1xNlTe9OQxmNPQDY9+u3ZxM/4wsKECgYBPvlYMaZNIOLFf7VXzUYGG
+rkXMpbLgLvIHvhF+4nsvspPVSqPeWjh2KMee3tMamy93H4R66G/KfoQw02JuZH+N
+HbGnnpyLa2jGjY0NkXEo08o2wsqv2QFtT/SFRoDLkah8rwZUwpxIg0akgrwwTslO
+rzAazDQvlb0itUxgU4qgqw==
 -----END PRIVATE KEY-----