Skip to content

Commit

Permalink
Merge pull request #64 from zsnmwy/fix/insecure-algorithm-SHA1-RSA
Browse files Browse the repository at this point in the history
fix: insecure algorithm SHA1-RSA
  • Loading branch information
qmhu authored Jul 1, 2022
2 parents 87a706e + fe28e22 commit b2917aa
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 12 deletions.
3 changes: 3 additions & 0 deletions charts/crane/keys/Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# About keys

All files copy form [crane](https://github.com/gocrane/crane)
19 changes: 19 additions & 0 deletions charts/crane/keys/ca.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDATCCAemgAwIBAgIUWYGdQ0E/7JXeun49tMyG6468vzMwDQYJKoZIhvcNAQEL
BQAwEDEOMAwGA1UEAwwFY3JhbmUwHhcNMjIwNjA2MTMxOTA2WhcNMzIwNjAzMTMx
OTA2WjAQMQ4wDAYDVQQDDAVjcmFuZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBAMSYcD2AyOVlwyxDts0W8rQB2RDacaw+M+Y/gObRoXBJd1gYzuKrv5Yb
oPSmWoXfR5LIh9Q8d/6ikbFW2bDtpogB8q4RdGBMUmyRKXrw5HvLKiAPtjsy1IRI
WNtrcD4DUAln5BFZfDo0iWWuccJhEOdw5ihjDgcx8z1io2Kft0/88+avAGpojO7l
yFs4L+8h/MSc3PMTusABvPLs3AXmAar0W/n0Z2f0XT+OTuzwWk7Jtu31rOFXGC2g
b4F0lgGUT3mxvz2YhjYnPEuOagmGqlMMNg8TSXRG66RNLHu07028Jmm29MiZkAyB
xpE+z17iYV/+awUQ3qT6f0Fc6mRn4LcCAwEAAaNTMFEwHQYDVR0OBBYEFAnKyXVQ
MP3d+p04rWaJiqiQdhKUMB8GA1UdIwQYMBaAFAnKyXVQMP3d+p04rWaJiqiQdhKU
MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJcenjQiLO0SkWLc
dEkXzFEIXLB8a2OD+2cql9VwOlDdUoWWi1UWuDD61EBCdklDYYsEDZkd/AXVLRm1
SVAXb98MKmFhVuk38jKgxPJOarbkERytNxkPpwogp1Aeu+QJoqA0cGZLNBEaWO9k
K0A6LvOF1btDsToO03mrFQIA+EaaxGtY10Ta0lrRvDvC2HfBMScUTcUfwT8D8MMs
3QHkL6hM9NEXeXrlDeluN0iD2d5ycbdTmgvQf0BPdr8ZTMlj39Ao/jTSwEz5baL2
0AUyKoie7PZpw8WP055D1Lv7XFcg3V07DZ7E0QrPK12B/cs5QcURoCTskA/IzAyW
oRrBQuk=
-----END CERTIFICATE-----
28 changes: 28 additions & 0 deletions charts/crane/keys/ca.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDEmHA9gMjlZcMs
Q7bNFvK0AdkQ2nGsPjPmP4Dm0aFwSXdYGM7iq7+WG6D0plqF30eSyIfUPHf+opGx
Vtmw7aaIAfKuEXRgTFJskSl68OR7yyogD7Y7MtSESFjba3A+A1AJZ+QRWXw6NIll
rnHCYRDncOYoYw4HMfM9YqNin7dP/PPmrwBqaIzu5chbOC/vIfzEnNzzE7rAAbzy
7NwF5gGq9Fv59Gdn9F0/jk7s8FpOybbt9azhVxgtoG+BdJYBlE95sb89mIY2JzxL
jmoJhqpTDDYPE0l0RuukTSx7tO9NvCZptvTImZAMgcaRPs9e4mFf/msFEN6k+n9B
XOpkZ+C3AgMBAAECggEAAONPXne+cIrNHt4PbU21OurnOBREfyqowVl4E5LOz9sF
FvjFtnBgJSVqzLATqJchk6AkPOkpAZVqYwqpYQsxvVuE5RRfGjA+Dw94yH1eCtEY
F5z6jbnlC9Pn0tXhY+ZP7jrx5MIqtXiXRkZLbT1S/jicUYJhBddL6fMQGdnu0gWo
awnIwLgwuUgH2Xnir13dB5tyTvTTYUbcncCe6LG3TMsUM6Qsm8K5g3OJMlHYpLBs
uO89RQiJNXlp8TJhiEyfVuXr3eRJaRp8uMpqE0lOvblgXEF67k5bNWPvHrs79Vjz
olJGdN1+HvWwoofF7e8WJPagCcKAKILloHvZqaoCgQKBgQD3m83VNmED4SWCSt6F
mzs0ABUZjkxNaj3qKJVXMXV95Ylc3whtx4+ehO2PioxSzox0CeXD5ZzgRf3RV+IZ
WEmYVFAYFgRPhxHIbqMl+/4lD/Na+7BrVHvrabF5KNZ9Zn7s+kSGCapX5olpImV4
R4vRcekXjRsQMgKI1uySZ7jNbwKBgQDLQg5SjSjhuhJSmTpkDjztjMRgc12faJU2
lWFTQpoIhRcb4z7JQBr+k6qQznY5MzUfHufzIDhHdqoKm3RzbJ4ODBMnUPWukAl+
3aqET8v0zV+znCw4QUY7QkTFxnRVuXqlTqkcdlRrpiI6pdjxSln0NhEAG9GNkuu8
I/jdmKSNOQKBgEfeMxollHcZzFdK/9drvP1U4MrwIHl/0sS6Ts5mDqIiE4KfQcUL
XUY3cvRs1FnclavAi64WYTg/WHKAvaF5nLLYFf9HtKyYmbLBWh1WTOfY/1tzHjuo
4+bqYJa4Ibl4HHMQGP+Goqisw0l+sFD/AzghhfROAoLq4Q1yxGuiK2OFAoGAU6U5
c6t3uXzzcV5xcx+Q30lgvzh6vNEzJqVOyg7MiNkMa4OXIQbqlP174d+1M1DpeYck
eR83SeGBlJ/oyl9Wo/1AHJvqnw3TeowKUizsiC/ERIvufrAOEPDykFldIrIT0NeQ
LJBdqXdS+sOphZLNdfyR/nN0R0jBDknXbooUnbECgYAa0tQUacJoPuOlZfFCMXtZ
Luq69M4s0k+nylz1r2sJtvSWGgIVuUttWzsKq0QUe7EL2w8DXfh+vOSCUbd4eJbA
rXFKSPTi7LKuvCQqMYEInSGidzU2214hlZwcxGm5NU7iMl4JfzAxy8fD6nPi9Euy
4xZPZdjj36tm8WDhxHnwjA==
-----END PRIVATE KEY-----
1 change: 1 addition & 0 deletions charts/crane/keys/ca.srl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
72ACE2EDA86E99B73AEE6616E55325A59E5BBB6D
20 changes: 20 additions & 0 deletions charts/crane/keys/tls.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDRjCCAi6gAwIBAgIUcqzi7ahumbc67mYW5VMlpZ5bu20wDQYJKoZIhvcNAQEL
BQAwEDEOMAwGA1UEAwwFY3JhbmUwHhcNMjIwNjA2MTMxOTA2WhcNMzIwNjAzMTMx
OTA2WjAiMSAwHgYDVQQDDBdjcmFuZWQuY3JhbmUtc3lzdGVtLnN2YzCCASIwDQYJ
KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKss7vErCXYxE1E9I9sRW3pISiZID8Vf
jIW4rpDlmT8Sa8IK7cMUZMXRgQ06+GI7a/aZyzCLagKcG5ksTyqpGKEK5qkVTme6
W3iNciyG9nMX5lJ83yvfiakP/EEYfNv3tjfUmjoNd5HUURuUcNhZqWyRnE4S0hMn
6OFxBM19Jd/byq+7FEfgaqdPHeXWLHTXDIiWwCSQFS6p6IvG1+K6X6f1o8TAEvrm
1yJ2WTPUsL/fSC6uN+vJq1CalVP4ERGiluPobZ8X1e1vdgsBOcS7oMwxzRW5ZDo4
i3gfdPpEMijySHSYAe6eyhg50tybD6EMkylzxBdvqssG6dfcQsaLJ+sCAwEAAaOB
hTCBgjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
AgYIKwYBBQUHAwEwSQYDVR0RBEIwQIIXY3JhbmVkLmNyYW5lLXN5c3RlbS5zdmOC
JWNyYW5lZC5jcmFuZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWwwDQYJKoZIhvcN
AQELBQADggEBAFSQjOY6AFQA13majQg8u1VoxJ/XsrMB0oldyUud3H/RkPM3VKQO
GDwme/E6TmvuCyzXRzPGOuxpOBhpwiPTZTxdic4TI7akyMMSm1xEDOt2bumhvK4L
9mlI6VkqyQKfRGNch3SStmL+gFTplK0ep9KSBVymb/nxTj8sCSNRy1c4Ig9/u94m
x+BjL2nK2QcI5ZZqcVZiHtYOaNoyB5iWZzNfVtBiqc7kLRSJVh5ZPtMb2mB07Muq
/K/G9Rn5GyOtsEodUZTkXiPWq1R3iABsK6WT4T9C6sjRxWCc2jhoVs+pJ3qosI0+
1DKss3eE6pD7mRnxnmfXzPkkFhueq8Uw6T8=
-----END CERTIFICATE-----
27 changes: 27 additions & 0 deletions charts/crane/keys/tls.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAqyzu8SsJdjETUT0j2xFbekhKJkgPxV+MhbiukOWZPxJrwgrt
wxRkxdGBDTr4Yjtr9pnLMItqApwbmSxPKqkYoQrmqRVOZ7pbeI1yLIb2cxfmUnzf
K9+JqQ/8QRh82/e2N9SaOg13kdRRG5Rw2FmpbJGcThLSEyfo4XEEzX0l39vKr7sU
R+Bqp08d5dYsdNcMiJbAJJAVLqnoi8bX4rpfp/WjxMAS+ubXInZZM9Swv99ILq43
68mrUJqVU/gREaKW4+htnxfV7W92CwE5xLugzDHNFblkOjiLeB90+kQyKPJIdJgB
7p7KGDnS3JsPoQyTKXPEF2+qywbp19xCxosn6wIDAQABAoIBADAnH8BwHuVEwO5l
iKSjqVwo4dMLCoS3cExdu52/OPDpOa8IbAIoxoBvgyI5qI3ZsXFZqjMpxNSfHZRl
Ro/1qZwD+QcvmzLK1dh/0dJ81O9jlcM2pYEuDQemG4wkW1t1v6jNAeW6zBwV4gsk
Iup5rpOAErxTxwzkeTqSFIvJ3NGwCJM10QO+yLC8I6+K7S6GMSqRHJIJWZsAgn+O
XFd1kNz9h7i/DGM8xHU0yAfPS0orkoBOrGzALcvl7CYZu96PC/Z9j3xre8fqBvOA
myVT+ytnbcwNhC2KVnnRVfaHl2KDQ42VBdNFlpmYCbCIATfFcm0Z5FPKNk9h637E
KDmlkGECgYEA41WicBEHszDRWEipoH8qUfqAAu3VWdJJPI4UWY01GX4XEtoB4yFP
Aa473G440pJB8hUnTvt74Fe6EoS8oBr60Ehay8vKWZnHIk7QeEDHtkJFxg+V21LS
k8I8HOEMzGsmKfG5vdUdhYQTwsjm1GaNGeE4PBt9ml+91Oc7EFsDTDUCgYEAwMJ8
HeNsSijw6GN7zBee2N8KJIlZ+uXRg/F3OuEE9s/bDpSOdZSz/6PBqcECFJcpvbCl
ARusytwqN2/IRbDoZLf4ajLoSFiv11obVbvz6MUYY9goh85eadmpIzkTqAf3eFA0
Xd4jGH0Pvof9FISOVDMCsLrQNYAAAIvEeygv558CgYA0H0Q5EY6EZSL6bN6Hb+CS
Hy8OfN031OD5w1GjHp8YEzLTHazlGJP2vK344kSg8uuvx23VzA8g5rxA1rIwuz7a
VlyK8VSZqopfsVZW2/NuNE+vE4+2U4z4V8ZUkLzQeZiscUG25o/4NsoZFNrnxAOB
9YNhNKRdqqnpkIKYQ2XEKQKBgQC/WFAc20UD2OBLz3V0g34LilxnKHFJvhjdATV6
HSTwXCT3tEA2OAb2HXiBKjcGeYfV5SPmlbJRLXw6y5vikloeoQDXavFp35+uBqRb
1teomP49HrYdGZ5fNNHRRTdd9YqSxAs3ourzxDF80UFIvM0MiBaDmO5WLVnTMOs5
1gq3wQKBgCV/cdf8FXqhLXrT4S4p0yThAUU7YFb2RN1oKfQfPIe7iLuOu8CywksE
KQ6OapudT7m9s7ahri5Ijqrad/A5cX8Frqnk1NQQJoB52T4H+Iv7LJbmcioZhVzR
V7iIer8N/gYqgnSrWvp7sfuqgCvgU7k95/WhFrPPvAO43hpMIKl1
-----END RSA PRIVATE KEY-----
8 changes: 4 additions & 4 deletions charts/crane/templates/craned-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ spec:
---
apiVersion: v1
data:
tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURPekNDQWlPZ0F3SUJBZ0lKQU9vSDdESmN5UkM4TUEwR0NTcUdTSWIzRFFFQkJRVUFNQkF4RGpBTUJnTlYKQkFNTUJXTnlZVzVsTUI0WERUSXlNREl5TWpFME16SXhOVm9YRFRNeU1ESXlNREUwTXpJeE5Wb3dJakVnTUI0RwpBMVVFQXd3WFkzSmhibVZrTG1OeVlXNWxMWE41YzNSbGJTNXpkbU13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBCkE0SUJEd0F3Z2dFS0FvSUJBUURLQ1VOc2JUT0NNUWMyL0pzWS9UVVp2NE0rM3h5OGE3K0ZTSkNFMTgyaWVJQnAKcWNTQXZKY2tCVjZodG0yUS8ycnR2M0QzWDJNL0NVYlg4M3dLY2tsSWttaC9oRlUrSkc2TVdKcmgwVUQzc1ZjTgpuTFlDaDFEczU0aGVOV3ZvTXJiZ1NRZkFYTVNhRmVwVU01M3NYdXIzcEozQmVCYTZDTGJKM0paeFdGR0l2L21XCkZKVFRhOS80MTI5TUNHZjIrTzN6aDZtSEdlZXBYQ0hQejQ1TlRKbmd4Q01nN3AxaTY2ano5UURLMk9JREdrbG0KS1ZoTEhWU2tFL1VMU3VWZVA4Wit5b1RJYndOVys0dVJFOSsydGFPaGZlSFcySTgxbHZ4VFZVZVRDbnFQa01mTAo4NVpKTnROUnJ6OSszSXJnYmpGaThSdHZDNlF1QkdkN0JHdGQ1YTFSQWdNQkFBR2pnWVV3Z1lJd0NRWURWUjBUCkJBSXdBREFMQmdOVkhROEVCQU1DQmVBd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3SUdDQ3NHQVFVRkJ3TUIKTUVrR0ExVWRFUVJDTUVDQ0YyTnlZVzVsWkM1amNtRnVaUzF6ZVhOMFpXMHVjM1pqZ2lWamNtRnVaV1F1WTNKaApibVV0YzNsemRHVnRMbk4yWXk1amJIVnpkR1Z5TG14dlkyRnNNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUJZCmtBcDVnWDQ1N2w0TFpDNkIyYUsxVWpHSzRFam4vUTRuSEhUWGNGVW0vN0tZeVJ5N1d2UjNmd1d3TnFNNDNrMXIKYjArS2Y4SDVvQUV5c2VJeXVVYW5ZVUQ0SGNHR1d0Yk05SnhpbDh4a1dQRy9yaEJJYkhEUkdYSkpXRTI0NVU5VwpOcGxsRmovT2xRYW45Y24rZGNqMGRzOWxHUHFzTVNlNXJ5eUZqSVRoeE1Za0FpZlJKak0yZkxGamExZTduR2lnCnhKZkFZK0RYbWJiQTJLN0Z0dmJHZUJjTXhCbFQwUEdlUWhJZVk2RVRJUDNRbHBnMnltdDJpejAvVXIzTzl1VmIKUFBJOWEzYjV0WG1nRUM3KzUwWVVYbHMwZUpEZlhWLzdlWS95SW45VGZjajJEb2d0cFYzM3JMWHovNS9XcWl3OQplQUxlSENmaDhmYzhld0RZT1JLUgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeWdsRGJHMHpnakVITnZ5YkdQMDFHYitEUHQ4Y3ZHdS9oVWlRaE5mTm9uaUFhYW5FCmdMeVhKQVZlb2JadGtQOXE3Yjl3OTE5alB3bEcxL044Q25KSlNKSm9mNFJWUGlSdWpGaWE0ZEZBOTdGWERaeTIKQW9kUTdPZUlYalZyNkRLMjRFa0h3RnpFbWhYcVZET2Q3RjdxOTZTZHdYZ1d1Z2kyeWR5V2NWaFJpTC81bGhTVQowMnZmK05kdlRBaG45dmp0ODRlcGh4bm5xVndoejgrT1RVeVo0TVFqSU82ZFl1dW84L1VBeXRqaUF4cEpaaWxZClN4MVVwQlAxQzBybFhqL0dmc3FFeUc4RFZ2dUxrUlBmdHJXam9YM2gxdGlQTlpiOFUxVkhrd3A2ajVESHkvT1cKU1RiVFVhOC9mdHlLNEc0eFl2RWJid3VrTGdSbmV3UnJYZVd0VVFJREFRQUJBb0lCQUZsQmVHajVZVzBkN2RzTQpCQlVwSUFGdEN6V0dhZktRQTMrRmpGc3ozNlBzYW9iRHVvMUpROWhsQ3VhVWFwbEpUZHNVM1hwYnlNTzdmSEhCCkhzYWFzT2QvenV5dThOM1FTSXAyUm82RzNKWFE0ZTJna3dSUTlaNkR0MG92ZmFtS1ppSjJBUmVwcEMyU2l3Q0MKQVQzQXZUdUVuVEV3dFpHZ2NlaUNMSENNblJDMVBrR2JaYlVCQlU3K3E5ZGpPU25oOC9iQ0w0cVkxK2RpbGZMSQplMU1VbTBTSmN6MlgwWU1VLzFYMm9aT2I4UVBXYjM1QjJxcG9ESjhzbFlKdStRUjgxeFlsWWhsTnpvaThyRThCCmhlRVcxa3dLMDlqcmFTbE5zZEx1WW1iNC9mVzFqbTgzL1crMmNnUkVyU2hRdFQwOENMQ3dPVER2NjFYeUhFbGoKb1d6UlNrRUNnWUVBNVV3UE9nOVpBc0FRMXE2N1dicktaUXlaOFdkR1dPV1hUK09lYi80MG5vd1JzVVhWMWlRWQozbDlzeTVHYnNSRnFkaXd4UXUzNVJ0RjhqbDM1L1AvNGhyeENwS2tNTDdZaG1xUFNqelNWT2ZTWlJDbVhDdEdvCnVnbzhFUmQ4RzhGbmJJM1RUdlplS1BqaVRieER3Y3ZqUFdWODJONzZhK21ucVVUQ0ZlNDlZeWtDZ1lFQTRaQjgKTnJJNWFZSHFrUWNPLzRldzBsOUJ4SkViQ2thQ2liNG9ORzBzcXpSQ01KTmFXNTBYWnFHcjQ1eE80TnNnaWZjTQo1ZU9ueWhtMGd1K0ZJZ1c0REpVL1JiZ1BiQngzNUlpREIxUERHY05nZmYxVnVxTldYTTVHQ2RQck04UDRtYzlnCm1RYUtxaGZPYlJIUUQyc08rekxjTGh3b1dRdVRWdnlzSlliVnBla0NnWUVBNCtNWjV3eEYzTFBpaUZzVW5ITkcKbi9OTU5GMzl6bkF3V0JmUzZWOXVFSDBKUUhRMXVDUWNDell2dklvMGdHRGN2Q0hqdTY4ajVqeGhYR1VPQldLcApMODkvTklOR04weitUT0N3YmQ5R3lGak8wcTI3RGVlZGwzaUFoa1FlOXI3YStVcGpUc0VRaUF3RGJsckR4S0hNCmNNS2l1QyswRnZnYngrRXNPL3VSU3pFQ2dZRUF1WU1uWmFTMjZ6dGFPK1RlUlBMSVRuemhqbFQ1TkQ1QlpoL3EKMlJOaFJYMDVZdElONG9NVWwrZ25nbzh2b0djWUg5Lzd6NmFvZk9NZlB3RFhNZUFhT3Q4VXByWjJtS2ZoUXlleQorL2U3NGhoNTU2VFBPU3pVL29iM3UyVjdiNXVoZm42OEo1N2x0SGJYNDRSZTVnOWF4dVpSaCtySWxGT2MzbEg1CkV2UU9DdUVDZ1lBQ3Z2UjBoVW5jMjNqYXNNYXNwUFVGTVFyeTFaTGtEdEcvWHMrUVlWSEFKWXpES2RaRUdoM1QKb3NNQng2STc2bDM3WjVEY05yb1hJZFJBUVJXVUxpUWIyelZMaG9LYjdzRXRmbDZmOUFnVnNXQjIvUjVVeHVKdQpKdHA1ZzNpUjZyd3dJZWJwYjRTR1VlcDByZXp5eFlwWXhaTHcyZHYwUEtYc3U0NzdCMFA3Vnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
tls.crt: {{ .Files.Get "keys/tls.crt" | b64enc }}
tls.key: {{ .Files.Get "keys/tls.key" | b64enc }}
kind: Secret
metadata:
name: webhook-server-tls
Expand Down Expand Up @@ -178,7 +178,7 @@ data:
text/xml
text/x-component
text/x-cross-domain-policy;
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
Expand Down Expand Up @@ -253,4 +253,4 @@ data:
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
{{ end }}
{{ end }}
Loading

0 comments on commit b2917aa

Please sign in to comment.