Remove expired certs and key, use them from oom.

Issue-ID: AAF-1159
Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
Change-Id: I658af495ce2e30e34f94bcb57bc06c335a7b724b

diff --git a/sms-service/bin/build_sms_image.sh b/sms-service/bin/build_sms_image.sh
index 5dead3f..9384843 100755 (executable)
--- a/sms-service/bin/build_sms_image.sh
+++ b/sms-service/bin/build_sms_image.sh
@@ -33,17 +33,8 @@ function generate_binary {
     cp ../target/preload .
 }
 
-function copy_certificates {
-    cp ../src/sms/certs/aaf_root_ca.cer .
-    cp ../src/sms/certs/aaf-sms.pub .
-    cp ../src/sms/certs/aaf-sms.pr .
-}
-
 function cleanup {
     rm sms preload
-    rm aaf-sms.pub
-    rm aaf-sms.pr
-    rm aaf_root_ca.cer
 }
 
 function build_image {
@@ -66,7 +57,6 @@ function push_image {
 }
 
 generate_binary
-copy_certificates
 build_image
 push_image
 cleanup

diff --git a/sms-service/bin/smsdockerfile b/sms-service/bin/smsdockerfile
index 829f89b..19f44d9 100644 (file)
--- a/sms-service/bin/smsdockerfile
+++ b/sms-service/bin/smsdockerfile
@@ -7,10 +7,8 @@ LABEL maintainer="vamshi krishna <vn00480215@techmahindra.com>"
 EXPOSE 10443
 RUN addgroup aaf && adduser -H -D -g "" -G aaf aaf && \
     mkdir -p /sms/auth && \
+    mkdir -p /sms/certs && \
     chown -R aaf:aaf /sms
-ADD aaf_root_ca.cer /sms/certs/aaf_root_ca.cer
-ADD aaf-sms.pub /sms/certs/aaf-sms.pub
-ADD aaf-sms.pr /sms/certs/aaf-sms.pr
 ADD sms /sms/bin/sms
 RUN chmod +x /sms/bin/sms
 ADD preload /sms/bin/preload

diff --git a/sms-service/src/sms/certs/aaf-sms.pr b/sms-service/src/sms/certs/aaf-sms.pr
deleted file mode 100644 (file)
index 25f3c00..0000000
--- a/sms-service/src/sms/certs/aaf-sms.pr
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,18B0B0561DBF8F6DDE10E971D35823DB
-
-JPEEyVbTw/Hn1DVe8GImTZysFCf2ejcWqVddfnV6cZb1PpMA3ohu0BR3pMhon3Tx
-ugerysfUzFESlPP911gc6MqWZw+rEP2AmsbP5hzVqgAhLQm48iOhPmTbJatWqj4W
-cif9OUJz5EBsnuop7hiFSjNaQC8vH9vvDbcjjZ9a7b8zF/iCfJCjTCt+htZnqyS8
-KCqWVYB2pmQLdks4ioV/A4UN2Zx6c9wzGHObqJh1eoqQdSwvk+lVT8/SIVoUW5fE
-hl3aYlUkDiF+q98jtsmgKPfS6NWOTnbFUAf6/EcyiYKxhLqg4CUpEehESbUQRxcd
-NvEQGA+2TqDy/U9H5TsgWR87uc0/v+t7yrTP7nnS2liqii0v46P/Jc/mChJwyOPh
-K01K6drdnwYwnUVT/vp4wnB3dRYzsIOJ9eYWpuKktT3tb5qmK72cyyvpJarBXxes
-0XS97tDcTlLImpL2K2xKLP+5JpxMGjMBrxJEtULMZP6+TwXEcbzN4gsZ7CFhSKl+
-/oCdeLr37rzLH4nsb+W/MGYTyp3HvEqAZAfWm+ePZyQasYABwpt+papYtc38Joeo
-GyNLpU0hwPwpS98rTVk9ei86DwwIiGuRvRkpuRx6L1S3H5UK7vAFWOGuYG/x422A
-RZq5dFfKeKygu09uw0lXnXiuVw0V/q/NKQCzEaC6CoJO3zFK0IQgImqXv8VKqAKc
-ekbkBrQA/JHGPyseHB2eCJ8hlIkBY6ZJIEbHi0ugMmh+pt3Np4mXD7ESS6z4Gxmw
-GZhAzh0TYzPIdumQd/dTI6rAWcLBm7S1A1QIwECbskH8lNAgkbTU+QCULdhWsLmB
-34k0NkoKYpK5v9RxoyYoM1Ig9g4iKb/w2WaexFUYZXiphbkF01u9WPIcRpEQ1hhC
-q32HTGQq3KWS/idb1YoTdViGzNVs2zWxlt8V4gh1IZNnpLFedvkxe9QTm4FaXxr8
-maPMqRj7e1QlCrde4TisHsgxL1g7MemX2bVmh0PAzA+kjSbI3g0qctNMPytuTqb/
-8KuwvctuWK7pvmjl6q6UnbOVU7QBKatcPYW9EqubyOzazn4tvrdEjhQFtAvnpLZN
-2FPhaeEna+wVQpqukdZuhRtmjlvvqrtmzEmzu59Swk6WDeDOKa24pLjXtgTiyLt5
-p88bhikc+W/IQs9OmJ2xamlEn7Gg2S58dyt8UHsUUqtT/qpPAhKYs2P9CPeW2fOS
-fmid6JEtsyCLEbdvOp/Bvy3dSgiQtyH58bewN3iQjP4744A6Sx/L7GjrYp4Ax0SU
-2N4b8HM/znrVT7fHhcELOsVVrDDqcZcExOi2LaC1gzJq37g+C2QREVVaVhNv8mss
-A9axWTniJQCRC1qRmVsPklzljaYlybAmtriyeKE3iIvjaTBZk5D6D5Hf47WVE4v1
-u1uZJSr7AvJ619vyEb2VV3aLzLln7h8Ml0B8JWz/P2d5w6NSJhH+NiUUNKeN4b2P
-Qk3xn3kP01x77lzWm1Ls1E41UXXvLaNhojFnCH44M4zMx6+Bq8rkPvq7cEsdVDIx
-W8A3/WpGTrdJjJ+UJAIkTTxxGWmFBSRgX/dkjeo0pEFCHx9mQQwZzGTpLCW9Ympu
------END RSA PRIVATE KEY-----

diff --git a/sms-service/src/sms/certs/aaf-sms.pub b/sms-service/src/sms/certs/aaf-sms.pub
deleted file mode 100644 (file)
index ba0aecf..0000000
--- a/sms-service/src/sms/certs/aaf-sms.pub
+++ /dev/null
@@ -1,63 +0,0 @@
-subject=CN = aaf-sms, emailAddress = , OU = aaf-sms@aaf-sms.onap.org, OU = OSAAF, O = ONAP, C = US
-issuer=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-notBefore=Jun  3 20:08:21 2019 GMT
-notAfter=Jun  3 20:08:21 2020 GMT
-SHA256 Fingerprint=63:B8:81:E0:77:67:66:85:10:61:73:C2:5A:01:D1:2A:EC:7F:AF:AD:FC:86:D6:40:65:4B:B6:42:7C:C6:7F:2C
------BEGIN CERTIFICATE-----
-MIIEZDCCA0ygAwIBAgIIfDQFJU4qiGgwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
-BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp
-bnRlcm1lZGlhdGVDQV85MB4XDTE5MDYwMzIwMDgyMVoXDTIwMDYwMzIwMDgyMVow
-cjEQMA4GA1UEAwwHYWFmLXNtczEPMA0GCSqGSIb3DQEJARYAMSEwHwYDVQQLDBhh
-YWYtc21zQGFhZi1zbXMub25hcC5vcmcxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKc+a31VHvQvcTEUloiBxNXk9NqeMEi39t7UxOdOl2Amd73LscEpaNSFCdDB
-42t28QqxRjOtrD9CLSSfICUSSgy9bNozTGDkDnb+eNwnUegSm/BtSvhDQisTI0zc
-n7aQd1y6zKJt/k+4PaS3iPtiEaCa1AsLS14VF8dTtvag5mfoHaLwDI6Ip/oDCqOA
-zQOujeA++xe+VQkw0SwSndQTzKq6Fxmem8v+8nicx14sltwEgPWO2nr5A+URWJDy
-enNqvFoGYJuMfXrxy9EmdwpGq7LDyqzijW3AjxL8x0zlRg50/+Pqwagnr2EhIggv
-hhS8/puE2tPP3zmHmJ2Uuq2UjBkCAwEAAaOCAScwggEjMAkGA1UdEwQCMAAwDgYD
-VR0PAQH/BAQDAgXgMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBU
-BgNVHSMETTBLgBSB95lbELnIjN7zUl7qTmmgQz6s3aEwpC4wLDEOMAwGA1UECwwF
-T1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTggEHMB0GA1UdDgQWBBTi
-lMZ/Eftx4/zB4QqU7I/JW9FWyTBvBgNVHREEaDBmggdhYWYtc21zgg9hYWYtc21z
-LWRiLm9uYXCCH2FhZi1zbXMuYXBpLnNpbXBsZWRlbW8ub25hcC5vcmeCDGFhZi1z
-bXMub25hcIIbYWFmLXNtcy5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqGSIb3DQEB
-CwUAA4IBAQBUGIskbnj1lKkI2QikMnCpZ1sietzfTT1frbyvxANxM+RnqWcdHN3p
-uoxHQ1pBzXB189tgQUCbetiDnaRv2K2O4xW0P8CxNd9fhZfypOi9Uz2PC8G2ScJX
-vkxDACfT8XVO/uion4qQJ3UFMkiOl67V4HpSwuZuWV+iuBhJRgxNylFfK4kVlf0T
-bs4LsD3mB1T8u33L3tOe/01IJ5Ccd46Z7g/s870Q5522XVGnI5PSIHl7PP0CJYmZ
-R79OhGzMh+0eO1dPBeZeDUA/DQrBJ04kRWtjT3C82V/4XyyAzDe0QnUQxqBkK39Q
-ETGeDlUwYU6N/1Tvo6MSpCC8yQs6GaD0
------END CERTIFICATE-----
-
-subject=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-issuer=OU = OSAAF, O = ONAP, C = US
-notBefore=Aug 17 18:51:37 2018 GMT
-notAfter=Aug 17 18:51:37 2023 GMT
-SHA256 Fingerprint=3B:33:F0:D2:94:FC:58:FC:13:9D:ED:AD:C3:D9:97:96:93:44:52:CC:1F:4D:F3:B3:7F:76:90:BB:E0:07:33:91
------BEGIN CERTIFICATE-----
-MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
-RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN
-MjMwODE3MTg1MTM3WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG
-A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv0HHUkba3uNtNI3jPKimUcd6RNwmhSCJL
-neMWpnjqp5/A+HCKyNsEaT4y177hNLmCm/aMm1u2JIfikc+8wEqLCSBBPz+P0h+d
-o+sZ7U+4oeQizdYYpEdzHJ2SieHHa8vtu80rU3nO2NEIkuYC20HcKSEtl8fFKsk3
-nqlhY+tGfYJPTXcDOQAO40BTcgat3C3uIJHkWJJ4RivunE4LEuRv9QyKgAw7rkJV
-v+f7guqpZlXy6dzAkuU7XULWcgo55MkZlssoiErMvEZJad5aWKvRY3g7qUjaQ6wO
-15wOAUoRBW96eeZZbytgn8kybcBy++Ue49gPtgm1MF/KlAsp0MD5AgMBAAGjgYYw
-gYMwHQYDVR0OBBYEFIH3mVsQuciM3vNSXupOaaBDPqzdMB8GA1UdIwQYMBaAFFNV
-M/JL69BRscF4msEoMXvv6u1JMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/
-BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAgEADxNymiCNr2e37iLReoaxKmZvwox0cTiNAaj7iafRzmwIoY3VXO8Q
-ix5IYcp4FaQ7fV1jyp/AmaSnyHf6Osl0sx8PxsQkO7ALttxKUrjfbvNSVUA2C/vl
-u5m7UVJLIUtFDZBWanzUSmkTsYLHpiANFQKd2c/cU1qXcyzgJVFEFVyyHNkF7Is+
-+pjG9M1hwQHOoTnEuU013P7X1mHek+RXEfhJWwe7UsZnBKZaZKbQZu7hEtqKWYp/
-QsHgnjoLYXsh0WD5rz/mBxdTdDLGpFqWDzDqb8rsYnqBzoowvsasV8X8OSkov0Ht
-8Yka0ckFH9yf8j1Cwmbl6ttuonOhky3N/gwLEozuhy7TPcZGVyzevF70kXy7g1CX
-kpFGJyEHXoprlNi8FR4I+NFzbDe6a2cFow1JN19AJ9Z5Rk5m7M0mQPaQ4RcikjB3
-aoLsASCJTm1OpOFHfxEKiBW4Lsp3Uc5/Rb9ZNbfLrwqWZRM7buW1e3ekLqntgbky
-uKKISHqVJuw/vXHl1jNibEo9+JuQ88VNuAcm7WpGUogeCa2iAlPTckPZei+MwZ8w
-tpvxTyYlZEC8DWzY1VC29+W2N5cvh01e2E3Ql08W1zL63dqrgdEZ3VWjzooYi4ep
-BmMXTvouW+Flyvcw/0oTcfN0biDIt0mCkZ5CQVjfGL9DTOYteR5hw+k=
------END CERTIFICATE-----
\ No newline at end of file

diff --git a/sms-service/src/sms/certs/aaf_root_ca.cer b/sms-service/src/sms/certs/aaf_root_ca.cer
deleted file mode 100644 (file)
index e9a50d7..0000000
--- a/sms-service/src/sms/certs/aaf_root_ca.cer
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
-NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
-XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
-H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
-pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
-NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
-2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
-wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
-ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
-P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
-aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
-PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
-A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
-UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
-L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
-7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
-c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
-jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
-RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
-PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
-CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
-Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
-cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
-ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
-dYY=
------END CERTIFICATE-----