From da08cf03e1971fe132ad43ee84695773cd751762 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Fri, 21 Jul 2023 17:35:07 +0800 Subject: [PATCH 1/3] chore: clean [skip ci] --- asset/.config | 75 -------------------------------------------------- asset/tpl.conf | 75 -------------------------------------------------- 2 files changed, 150 deletions(-) delete mode 100644 asset/.config delete mode 100644 asset/tpl.conf diff --git a/asset/.config b/asset/.config deleted file mode 100644 index eb47d8b..0000000 --- a/asset/.config +++ /dev/null @@ -1,75 +0,0 @@ -[ ca ] -default_ca = CA_own -[ CA_own ] -dir = . -certs = $dir -new_certs_dir = $dir/db/certs -database = $dir/db/index -serial = $dir/db/serial -RANDFILE = $dir/db/rand -certificate = $dir/ca.crt -private_key = $dir/ca.key -default_days = 3650 -default_crl_days = 30 -default_md = sha256 -preserve = no -policy = policy_anything -string_mask = utf8only -x509_extensions = usr_cert # The extentions to add to the cert - -[ policy_anything ] -countryName = optional -stateOrProvinceName = optional -localityName = optional -organizationName = optional -organizationalUnitName = optional -commonName = supplied -emailAddress = optional - -[ req ] -default_bits = 2048 -default_md = sha256 -distinguished_name = req_distinguished_name -attributes = req_attributes -x509_extensions = v3_ca - -[ req_distinguished_name ] -countryName = Country Name (2 letter code) -countryName_default = -stateOrProvinceName = State or Province Name (full name) 省 -stateOrProvinceName_default = -localityName = Locality Name (eg, city) 城市 -localityName_default = -organizationName = Organization Name (eg, company) 组织 -organizationName_default = -organizationalUnitName = Organizational Unit Name (eg, section) 组织单元 -organizationalUnitName_default = - -commonName = Common Name -commonName_default = -commonName_max = 64 -emailAddress = Email Address -emailAddress_default = af -emailAddress_max = 64 - -[ req_attributes ] -challengePassword = A challenge password -challengePassword_min = 4 -challengePassword_max = 20 -unstructuredName = An optional company name -#unstructuredName_default = - -[v3_ca] -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid:always,issuer:always -basicConstraints = CA:true -keyUsage = keyCertSign, cRLSign -extendedKeyUsage = serverAuth, clientAuth, codeSigning, emailProtection - - -[ usr_cert ] -basicConstraints = CA:FALSE -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid,issuer -keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment -#extendedKeyUsage = serverAuth, clientAuth diff --git a/asset/tpl.conf b/asset/tpl.conf deleted file mode 100644 index 25452b6..0000000 --- a/asset/tpl.conf +++ /dev/null @@ -1,75 +0,0 @@ -[ ca ] -default_ca = CA_own -[ CA_own ] -dir = . -certs = $dir -new_certs_dir = $dir/db/certs -database = $dir/db/index -serial = $dir/db/serial -RANDFILE = $dir/db/rand -certificate = $dir/ca.crt -private_key = $dir/ca.key -default_days = 3650 -default_crl_days = 30 -default_md = %hash% -preserve = no -policy = policy_anything -string_mask = utf8only -x509_extensions = usr_cert # The extentions to add to the cert - -[ policy_anything ] -countryName = optional -stateOrProvinceName = optional -localityName = optional -organizationName = optional -organizationalUnitName = optional -commonName = supplied -emailAddress = optional - -[ req ] -default_bits = 2048 -default_md = %hash% -distinguished_name = req_distinguished_name -attributes = req_attributes -x509_extensions = v3_ca - -[ req_distinguished_name ] -countryName = Country Name (2 letter code) -countryName_default = %C% -stateOrProvinceName = State or Province Name (full name) 省 -stateOrProvinceName_default = %ST% -localityName = Locality Name (eg, city) 城市 -localityName_default = %L% -organizationName = Organization Name (eg, company) 组织 -organizationName_default = %O% -organizationalUnitName = Organizational Unit Name (eg, section) 组织单元 -organizationalUnitName_default = %OU% - -commonName = Common Name -commonName_default = %CN% -commonName_max = 64 -emailAddress = Email Address -emailAddress_default = %emailAddress% -emailAddress_max = 64 - -[ req_attributes ] -challengePassword = A challenge password -challengePassword_min = 4 -challengePassword_max = 20 -unstructuredName = An optional company name -#unstructuredName_default = - -[v3_ca] -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid:always,issuer:always -basicConstraints = CA:true -keyUsage = keyCertSign, cRLSign -extendedKeyUsage = serverAuth, clientAuth, codeSigning, emailProtection - - -[ usr_cert ] -basicConstraints = CA:FALSE -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid,issuer -keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment -#extendedKeyUsage = serverAuth, clientAuth From 8ff64bdef05dc994b92507787aa021f36f45d8b1 Mon Sep 17 00:00:00 2001 From: waiting <1661926154@qq.com> Date: Fri, 21 Jul 2023 17:38:59 +0800 Subject: [PATCH 2/3] fix(myca): kind for client --- packages/myca/src/lib/cert.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/myca/src/lib/cert.ts b/packages/myca/src/lib/cert.ts index 7ffaf3d..d1d99ac 100644 --- a/packages/myca/src/lib/cert.ts +++ b/packages/myca/src/lib/cert.ts @@ -86,10 +86,11 @@ export async function genCert(options: CertOpts, conf?: Partial): Promis const crtTmpPath = `${centerPath}/${crtTmpName}` try { - const { caKeyPass } = issueOpts + const { caKeyPass, kind } = issueOpts const signOpts: SignOpts = { ...initialSignOpts, centerPath, + kind, // caCrtFile: issueCertRet.caCrtFile, // caKeyFile: issueCertRet.caKeyFile, // csrFile: issueCertRet.csrFile, From 9fee21520cf08a95c01ce4d5216b6c329726c83b Mon Sep 17 00:00:00 2001 From: waitingsong Date: Fri, 21 Jul 2023 17:42:26 +0800 Subject: [PATCH 3/3] v4.1.3 --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- packages/myca-cli/CHANGELOG.md | 8 ++++++++ packages/myca-cli/package.json | 4 ++-- packages/myca/CHANGELOG.md | 11 +++++++++++ packages/myca/package.json | 2 +- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cea928..2426abe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.1.3](https://github.com/waitingsong/node-myca/compare/v4.1.2...v4.1.3) (2023-07-21) + + +### Bug Fixes + +* **myca:** kind for client ([8ff64bd](https://github.com/waitingsong/node-myca/commit/8ff64bdef05dc994b92507787aa021f36f45d8b1)) + + + + + ## [4.1.2](https://github.com/waitingsong/node-myca/compare/v4.1.1...v4.1.2) (2023-07-21) diff --git a/lerna.json b/lerna.json index 3f337bc..eb41ecd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.1.2", + "version": "4.1.3", "command": { "publish": { "ignoreChanges": [ diff --git a/packages/myca-cli/CHANGELOG.md b/packages/myca-cli/CHANGELOG.md index a9d90e0..78e0fd5 100644 --- a/packages/myca-cli/CHANGELOG.md +++ b/packages/myca-cli/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.1.3](https://github.com/waitingsong/node-myca/compare/v4.1.2...v4.1.3) (2023-07-21) + +**Note:** Version bump only for package myca-cli + + + + + ## [4.1.2](https://github.com/waitingsong/node-myca/compare/v4.1.1...v4.1.2) (2023-07-21) **Note:** Version bump only for package myca-cli diff --git a/packages/myca-cli/package.json b/packages/myca-cli/package.json index c14a35b..a0cab22 100644 --- a/packages/myca-cli/package.json +++ b/packages/myca-cli/package.json @@ -1,7 +1,7 @@ { "name": "myca-cli", "author": "waiting", - "version": "4.1.2", + "version": "4.1.3", "description": "command line of creating Self-signed CA certificate for development use and issue server or client certificates, generated using openssl", "keywords": [ "CA", @@ -52,7 +52,7 @@ "dependencies": { "@waiting/shared-core": "^21.2.1", "minimist": "^1.2.8", - "myca": "^4.1.2", + "myca": "^4.1.3", "ts-node": "^10.9.1", "zx": "7" }, diff --git a/packages/myca/CHANGELOG.md b/packages/myca/CHANGELOG.md index 6337c66..83b6da5 100644 --- a/packages/myca/CHANGELOG.md +++ b/packages/myca/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.1.3](https://github.com/waitingsong/node-myca/compare/v4.1.2...v4.1.3) (2023-07-21) + + +### Bug Fixes + +* **myca:** kind for client ([8ff64bd](https://github.com/waitingsong/node-myca/commit/8ff64bdef05dc994b92507787aa021f36f45d8b1)) + + + + + ## [4.1.2](https://github.com/waitingsong/node-myca/compare/v4.1.1...v4.1.2) (2023-07-21) diff --git a/packages/myca/package.json b/packages/myca/package.json index 49aeb87..d988bb0 100644 --- a/packages/myca/package.json +++ b/packages/myca/package.json @@ -1,7 +1,7 @@ { "name": "myca", "author": "waiting", - "version": "4.1.2", + "version": "4.1.3", "description": "Create Self-signed CA certificate for development use and issue server or client certificates, generated using openssl", "keywords": [ "CA",