Skip to content

fixing certs to be seeded by sha256 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 1, 2022
Merged

fixing certs to be seeded by sha256 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a3f205
fixing certs
Aug 30, 2022
627a55b
remove .srl
Aug 30, 2022
3dec382
remove .srl
Aug 30, 2022
3a9fc66
bumped the encryption
Aug 30, 2022
3768cfa
fix sdk tests
Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ whitesource/
*.log
*.test
*.orig
certs/*
sdk/certs/**

__debug_bin
.key
.key.*
.srl
.next-version
.devops-utils/

Expand Down
33 changes: 17 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ FREEBSD_DISTROS?="FreeBSD:12:amd64" "FreeBSD:13:amd64"
APK_VERSIONS?=3.13 3.14 3.15 3.16
APK_ARCHS?=aarch64 x86_64

CERTS_DIR := ./build/certs
PACKAGE_PREFIX := nginx-agent
PACKAGES_DIR := ./build/packages
PACKAGES_REPO := "pkgs-test.nginx.com"
Expand Down Expand Up @@ -258,29 +259,29 @@ test-install: ## Run agent install test
# Cert Generation #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
certs: ## Generate TLS certificates
scripts/mtls/gen_cnf.sh ca --cn 'client-ca.local' --state Cork --locality Cork --org NGINX --country IE --out certs/client/conf
scripts/mtls/gen_cert.sh ca --config certs/client/conf/ca.cnf --out certs/client
scripts/mtls/gen_cnf.sh ca --cn 'client-ca.local' --state Cork --locality Cork --org NGINX --country IE --out ${CERTS_DIR}/client/conf
scripts/mtls/gen_cert.sh ca --config ${CERTS_DIR}/client/conf/ca.cnf --out ${CERTS_DIR}/client

scripts/mtls/gen_cnf.sh intermediate --cn 'client-int.local' --org NGINX --locality Cork --out certs/client/conf
scripts/mtls/gen_cert.sh intermediate --config certs/client/conf/int.cnf --ca-cert certs/client/ca.crt --ca-key certs/client/ca.key --out certs/client
scripts/mtls/gen_cnf.sh intermediate --cn 'client-int.local' --org NGINX --locality Cork --out ${CERTS_DIR}/client/conf
scripts/mtls/gen_cert.sh intermediate --config ${CERTS_DIR}/client/conf/int.cnf --ca-cert ${CERTS_DIR}/client/ca.crt --ca-key ${CERTS_DIR}/client/ca.key --out ${CERTS_DIR}/client

scripts/mtls/gen_cnf.sh end-entity --cn 'client.local' --san 'DNS.1=client.local' --out certs/client/conf
scripts/mtls/gen_cert.sh end-entity --config certs/client/conf/ee.cnf --ca-cert certs/client/int.crt --ca-key certs/client/int.key --out certs/client
scripts/mtls/gen_cnf.sh end-entity --cn 'client.local' --san 'DNS.1=client.local' --out ${CERTS_DIR}/client/conf
scripts/mtls/gen_cert.sh end-entity --config ${CERTS_DIR}/client/conf/ee.cnf --ca-cert ${CERTS_DIR}/client/int.crt --ca-key ${CERTS_DIR}/client/int.key --out ${CERTS_DIR}/client

cp certs/client/ee.crt certs/client.crt
cp certs/client/ee.key certs/client.key
cp ${CERTS_DIR}/client/ee.crt ${CERTS_DIR}/client.crt
cp ${CERTS_DIR}/client/ee.key ${CERTS_DIR}/client.key

scripts/mtls/gen_cnf.sh ca --cn 'server-ca.local' --state Cork --locality Cork --org NGINX --country IE --out certs/server/conf
scripts/mtls/gen_cert.sh ca --config certs/server/conf/ca.cnf --out certs/server
scripts/mtls/gen_cnf.sh ca --cn 'server-ca.local' --state Cork --locality Cork --org NGINX --country IE --out ${CERTS_DIR}/server/conf
scripts/mtls/gen_cert.sh ca --config ${CERTS_DIR}/server/conf/ca.cnf --out ${CERTS_DIR}/server

scripts/mtls/gen_cnf.sh intermediate --cn 'server-int.local' --org NGINX --locality Cork --out certs/server/conf
scripts/mtls/gen_cert.sh intermediate --config certs/server/conf/int.cnf --ca-cert certs/server/ca.crt --ca-key certs/server/ca.key --out certs/server
scripts/mtls/gen_cnf.sh intermediate --cn 'server-int.local' --org NGINX --locality Cork --out ${CERTS_DIR}/server/conf
scripts/mtls/gen_cert.sh intermediate --config ${CERTS_DIR}/server/conf/int.cnf --ca-cert ${CERTS_DIR}/server/ca.crt --ca-key ${CERTS_DIR}/server/ca.key --out ${CERTS_DIR}/server

scripts/mtls/gen_cnf.sh end-entity --cn 'tls.example.com' --san 'DNS.1=tls.example.com' --out certs/server/conf
scripts/mtls/gen_cert.sh end-entity --config certs/server/conf/ee.cnf --ca-cert certs/server/int.crt --ca-key certs/server/int.key --out certs/server
scripts/mtls/gen_cnf.sh end-entity --cn 'tls.example.com' --san 'DNS.1=tls.example.com' --out ${CERTS_DIR}/server/conf
scripts/mtls/gen_cert.sh end-entity --config ${CERTS_DIR}/server/conf/ee.cnf --ca-cert ${CERTS_DIR}/server/int.crt --ca-key ${CERTS_DIR}/server/int.key --out ${CERTS_DIR}/server

cp certs/server/ee.crt certs/server.crt
cp certs/server/ee.key certs/server.key
cp ${CERTS_DIR}/server/ee.crt ${CERTS_DIR}/server.crt
cp ${CERTS_DIR}/server/ee.key ${CERTS_DIR}/server.key

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Docker Helper Targets #
Expand Down
8 changes: 5 additions & 3 deletions scripts/mtls/gen_cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ parse_args() {

create_self_signed() {
if ! openssl req \
-new \
-newkey rsa:4096 \
-nodes \
-x509 \
-sha512 \
-keyout "$OUT/$1.key" \
-out "$OUT/$1.crt" \
-config "$CONFIG" \
Expand All @@ -95,8 +96,9 @@ create_self_signed() {

create_csr() {
if ! openssl req \
-new \
-newkey rsa:4096 \
-nodes \
-sha512 \
-keyout "$OUT/$1.key" \
-out "$OUT/$1.csr" \
-config "$CONFIG" \
Expand Down Expand Up @@ -171,4 +173,4 @@ case $1 in
help "$0"
exit 1
;;
esac
esac
6 changes: 3 additions & 3 deletions scripts/mtls/gen_cnf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ default_bits = ${KEY_SIZE:-"4096"}
default_days = ${DAYS:-"365"}
distinguished_name = req_distinguished_name
prompt = no
default_md = sha256
default_md = sha512
req_extensions = v3_req
policy = policy

Expand Down Expand Up @@ -158,7 +158,7 @@ default_bits = ${KEY_SIZE:-"4096"}
default_days = ${DAYS:-"365"}
distinguished_name = req_distinguished_name
prompt = no
default_md = sha256
default_md = sha512
req_extensions = v3_req
policy = policy

Expand Down Expand Up @@ -205,4 +205,4 @@ case $1 in
help "$0"
exit 1
;;
esac
esac
8 changes: 4 additions & 4 deletions sdk/config_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ var tests = []struct {
Mtime: &types.Timestamp{Seconds: 1633343804, Nanos: 15240107},
SubjAltNames: nil,
PublicKeyAlgorithm: "RSA",
SignatureAlgorithm: "SHA256-RSA",
SignatureAlgorithm: "SHA512-RSA",
SerialNumber: "12554968962670027276",
SubjectKeyIdentifier: "75:50:E2:24:8F:6F:13:1D:81:20:E1:01:0B:57:2B:98:39:E5:2E:C3",
Fingerprint: "48:6D:05:D4:78:10:91:15:69:74:9C:6A:54:F7:F2:FC:C8:93:46:E8:28:42:24:41:68:41:51:1E:1E:43:E0:12",
FingerprintAlgorithm: "SHA256-RSA",
FingerprintAlgorithm: "SHA512-RSA",
AuthorityKeyIdentifier: "3A:79:E0:3E:61:CD:94:29:1D:BB:45:37:0B:E9:78:E9:2F:40:67:CA",
Version: 3,
},
Expand Down Expand Up @@ -372,12 +372,12 @@ var tests = []struct {
Mtime: &types.Timestamp{Seconds: 1633343804, Nanos: 15240107},
SubjAltNames: nil,
PublicKeyAlgorithm: "RSA",
SignatureAlgorithm: "SHA256-RSA",
SignatureAlgorithm: "SHA512-RSA",
SerialNumber: "12554968962670027276",
SubjectKeyIdentifier: "75:50:E2:24:8F:6F:13:1D:81:20:E1:01:0B:57:2B:98:39:E5:2E:C3",
Fingerprint: "48:6D:05:D4:78:10:91:15:69:74:9C:6A:54:F7:F2:FC:C8:93:46:E8:28:42:24:41:68:41:51:1E:1E:43:E0:12",
AuthorityKeyIdentifier: "3A:79:E0:3E:61:CD:94:29:1D:BB:45:37:0B:E9:78:E9:2F:40:67:CA",
FingerprintAlgorithm: "SHA256-RSA",
FingerprintAlgorithm: "SHA512-RSA",
Version: 3,
},
},
Expand Down