Skip to content

Commit

Permalink
coveralls test
Browse files Browse the repository at this point in the history
  • Loading branch information
abericyang@gmail.com committed Sep 24, 2019
1 parent 3cc7be6 commit 645ccfd
Show file tree
Hide file tree
Showing 9 changed files with 404 additions and 188 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ gnomon.CryptoRSA(). … // RSA
gnomon.CryptoECC(). … // ECC
gnomon.CryptoAES(). … // AES
gnomon.CryptoDES(). … // DES
gnomon.CA(). … // CA
gnomon.Log(). … // 日志
gnomon.Scale(). … // 算数/转换
gnomon.Time(). … // 时间
Expand Down
51 changes: 47 additions & 4 deletions ca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ func (ca *CACommon) GenerateCertificateRequest(cert *CertRequestModel) (csr []by
return csrData, nil
}

// GenerateCertificate 对签名请求进行处理并生成签名数字证书
// GenerateCertificateSelf 对签名请求进行处理并生成自签名数字证书
//
// cert 签名数字证书对象
func (ca *CACommon) GenerateCertificate(cert *Cert) (certData []byte, err error) {
func (ca *CACommon) GenerateCertificateSelf(cert *CertSelf) (certData []byte, err error) {
template := &x509.Certificate{
SerialNumber: big.NewInt(rd.Int63()), // 证书序列号
Subject: cert.Subject,
Expand Down Expand Up @@ -202,11 +202,48 @@ func (ca *CACommon) GenerateCertificate(cert *Cert) (certData []byte, err error)
return nil, err
}
return certData, nil
}

// GenerateCertificate 对签名请求进行处理并生成签名数字证书
//
// cert 签名数字证书对象
func (ca *CACommon) GenerateCertificate(cert *Cert) (certData []byte, err error) {
template := &x509.Certificate{
SerialNumber: big.NewInt(rd.Int63()), // 证书序列号
Subject: cert.Subject,
NotBefore: cert.NotBeforeDays,
NotAfter: cert.NotAfterDays,
BasicConstraintsValid: cert.BasicConstraintsValid,
IsCA: cert.IsCA,
SignatureAlgorithm: cert.SignatureAlgorithm,
ExtKeyUsage: cert.ExtKeyUsage,
KeyUsage: cert.KeyUsage,
SubjectKeyId: []byte{1, 2, 3},
}
certData, err = x509.CreateCertificate(rand.Reader, template, cert.ParentCert, cert.PublicKey, cert.PrivateKey)
if err != nil {
return nil, err
}
path := File().ParentPath(cert.CertificateFilePath)
// 创建生成目录
if !File().PathExists(path) {
if err = os.MkdirAll(path, os.ModePerm); nil != err {
return nil, err
}
}
fileIO, err := os.OpenFile(cert.CertificateFilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
if nil != err {
return nil, err
}
// 将block的PEM编码写入fileIO
if err = pem.Encode(fileIO, &pem.Block{Type: certificateType, Bytes: certData}); nil != err {
return nil, err
}
return certData, nil
}

// Cert 签名数字证书对象
type Cert struct {
// CertSelf 自签名数字证书对象
type CertSelf struct {
CertificateFilePath string // 签名后数字证书文件存储路径
Subject pkix.Name // Subject 签名信息
PrivateKey, PublicKey interface{} // 公私钥
Expand All @@ -218,6 +255,12 @@ type Cert struct {
SignatureAlgorithm x509.SignatureAlgorithm // signatureAlgorithm 生成证书时候采用的签名算法
}

// Cert 签名数字证书对象
type Cert struct {
ParentCert *x509.Certificate // 父证书对象
CertSelf
}

// CertRequest 证书生成请求对象
type CertRequest struct {
PrivateKeyData []byte // privateKeyData 私钥字节数组
Expand Down
123 changes: 101 additions & 22 deletions ca_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ var (
pathcaeccpemp384 = "./tmp/example/ca/pemp384"
pathcaeccpemp521 = "./tmp/example/ca/pemp521"

priData []byte
parentCert *x509.Certificate
priData []byte
certData []byte

caPriKeyFileName = "rootCA.key" // ca 私钥
caCertificateRequestFileName = "rootCA.csr" // 证书签名请求文件
Expand All @@ -61,7 +63,7 @@ var CAMockSubject = pkix.Name{
}

func TestCACommon_GenerateRSAPKCS1PrivateKey(t *testing.T) {
if _, errCA = CryptoRSA().GeneratePKCS1PriKey(512, pathcarsapksc1512, caPriKeyFileName); nil != errCA {
if _, errCA = CryptoRSA().GeneratePriKey(512, pathcarsapksc1512, caPriKeyFileName, CryptoRSA().PKSC1()); nil != errCA {
t.Error(errCA)
}
priData, errCA = ioutil.ReadFile(filepath.Join(pathcarsapksc1512, caPriKeyFileName))
Expand All @@ -77,7 +79,7 @@ func TestCACommon_GenerateRSAPKCS1PrivateKey(t *testing.T) {
t.Error(errCA)
}

if _, errCA = CryptoRSA().GeneratePKCS1PriKeyWithPass(1024, pathcarsapksc11024, caPriKeyFileName, "123456"); nil != errCA {
if _, errCA = CryptoRSA().GeneratePriKeyWithPass(1024, pathcarsapksc11024, caPriKeyFileName, "123456", x509.PEMCipher3DES, CryptoRSA().PKSC1()); nil != errCA {
t.Error(errCA)
}
priData, errCA = ioutil.ReadFile(filepath.Join(pathcarsapksc11024, caPriKeyFileName))
Expand All @@ -95,7 +97,7 @@ func TestCACommon_GenerateRSAPKCS1PrivateKey(t *testing.T) {
}

func TestCACommon_GenerateRSAPKCS1PrivateKeyFP(t *testing.T) {
if _, errCA = CryptoRSA().GeneratePKCS1PriKey(512, pathcarsapksc1512, caPriKeyFileName); nil != errCA {
if _, errCA = CryptoRSA().GeneratePriKey(512, pathcarsapksc1512, caPriKeyFileName, CryptoRSA().PKSC1()); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateRSACertificateRequestFP(&CertRequestFP{
Expand All @@ -107,7 +109,7 @@ func TestCACommon_GenerateRSAPKCS1PrivateKeyFP(t *testing.T) {
t.Error(errCA)
}

if _, errCA = CryptoRSA().GeneratePKCS1PriKeyWithPass(1024, pathcarsapksc11024, caPriKeyFileName, "123456"); nil != errCA {
if _, errCA = CryptoRSA().GeneratePriKeyWithPass(1024, pathcarsapksc11024, caPriKeyFileName, "123456", x509.PEMCipher3DES, CryptoRSA().PKSC1()); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateRSACertificateRequestFPWithPass(&CertRequestFP{
Expand All @@ -121,7 +123,7 @@ func TestCACommon_GenerateRSAPKCS1PrivateKeyFP(t *testing.T) {
}

func TestCACommon_GenerateRSAPKCS8PrivateKeyFP(t *testing.T) {
if priRSAKey, errCA = CryptoRSA().GeneratePKCS8PriKey(1024, pathcarsapksc81024, caPriKeyFileName); nil != errCA {
if priRSAKey, errCA = CryptoRSA().GeneratePriKey(1024, pathcarsapksc81024, caPriKeyFileName, CryptoRSA().PKSC8()); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateRSACertificateRequestFP(&CertRequestFP{
Expand All @@ -134,7 +136,7 @@ func TestCACommon_GenerateRSAPKCS8PrivateKeyFP(t *testing.T) {
}, CryptoRSA().PKSC8()); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateCertificate(&Cert{
if _, errCA = CA().GenerateCertificateSelf(&CertSelf{
CertificateFilePath: filepath.Join(pathcarsapksc81024, caCertificateFileName),
Subject: CAMockSubject,
PrivateKey: priRSAKey,
Expand All @@ -150,7 +152,7 @@ func TestCACommon_GenerateRSAPKCS8PrivateKeyFP(t *testing.T) {
t.Error(errCA)
}

if _, errCA = CryptoRSA().GeneratePKCS8PriKeyWithPass(2048, pathcarsapksc82048, caPriKeyFileName, "123456"); nil != errCA {
if _, errCA = CryptoRSA().GeneratePriKeyWithPass(2048, pathcarsapksc82048, caPriKeyFileName, "123456", x509.PEMCipher3DES, CryptoRSA().PKSC8()); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateRSACertificateRequestFPWithPass(&CertRequestFP{
Expand Down Expand Up @@ -184,7 +186,7 @@ func TestCACommon_GenerateECCPrivateKey(t *testing.T) {
if priKeyP224, errCA = CryptoECC().LoadPriPem(priData); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateCertificate(&Cert{
if _, errCA = CA().GenerateCertificateSelf(&CertSelf{
CertificateFilePath: filepath.Join(pathcaeccpemp224, caCertificateFileName),
Subject: CAMockSubject,
PrivateKey: priKeyP224,
Expand Down Expand Up @@ -216,7 +218,7 @@ func TestCACommon_GenerateECCPrivateKey(t *testing.T) {
if priKeyP256, errCA = CryptoECC().LoadPriPemFP(filepath.Join(pathcaeccpemp256, caPriKeyFileName)); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateCertificate(&Cert{
if _, errCA = CA().GenerateCertificateSelf(&CertSelf{
CertificateFilePath: filepath.Join(pathcaeccpemp256, caCertificateFileName),
Subject: CAMockSubject,
PrivateKey: priKeyP256,
Expand Down Expand Up @@ -250,7 +252,7 @@ func TestCACommon_GenerateECCPrivateKey(t *testing.T) {
if priKeyP384, errCA = CryptoECC().LoadPriPemFPWithPass(filepath.Join(pathcaeccpemp384, caPriKeyFileName), "123456"); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateCertificate(&Cert{
if certData, errCA = CA().GenerateCertificateSelf(&CertSelf{
CertificateFilePath: filepath.Join(pathcaeccpemp384, caCertificateFileName),
Subject: CAMockSubject,
PrivateKey: priKeyP384,
Expand Down Expand Up @@ -280,19 +282,96 @@ func TestCACommon_GenerateECCPrivateKey(t *testing.T) {
if priKeyP521, errCA = CryptoECC().LoadPriPemFPWithPass(filepath.Join(pathcaeccpemp521, caPriKeyFileName), "123456"); nil != errCA {
t.Error(errCA)
}
if parentCert, errCA = x509.ParseCertificate(certData); nil != errCA {
t.Error(errCA)
}
if _, errCA = CA().GenerateCertificate(&Cert{
CertificateFilePath: filepath.Join(pathcaeccpemp521, caCertificateFileName),
Subject: CAMockSubject,
PrivateKey: priKeyP521,
PublicKey: priKeyP521.Public(),
NotAfterDays: time.Now(),
NotBeforeDays: time.Now().Add(5000 * 24 * time.Hour),
BasicConstraintsValid: true,
IsCA: true,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign | x509.KeyUsageDataEncipherment,
SignatureAlgorithm: x509.ECDSAWithSHA512,
ParentCert: parentCert,
CertSelf: CertSelf{
CertificateFilePath: filepath.Join(pathcaeccpemp521, caCertificateFileName),
Subject: CAMockSubject,
PrivateKey: priKeyP384,
PublicKey: priKeyP384.Public(),
NotAfterDays: time.Now(),
NotBeforeDays: time.Now().Add(5000 * 24 * time.Hour),
BasicConstraintsValid: true,
IsCA: true,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign | x509.KeyUsageDataEncipherment,
SignatureAlgorithm: x509.ECDSAWithSHA384,
},
}); nil != errCA {
t.Error(errCA)
}
}

func TestCACommon_GenerateRSACertificateRequest_Fail(t *testing.T) {
_, errCA = CA().GenerateRSACertificateRequest(&CertRequest{
PrivateKeyData: priData,
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
SignatureAlgorithm: x509.SHA256WithRSAPSS,
Subject: CAMockSubject,
}, CryptoRSA().PKSC1())
t.Log(errCA)
}

func TestCACommon_GenerateRSACertificateRequestFP_Fail(t *testing.T) {
_, errCA = CA().GenerateRSACertificateRequestFP(&CertRequestFP{
PrivateKeyFilePath: "",
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
SignatureAlgorithm: x509.SHA256WithRSAPSS,
Subject: CAMockSubject,
}, CryptoRSA().PKSC1())
t.Log(errCA)
}

func TestCACommon_GenerateRSACertificateRequestWithPass_Fail(t *testing.T) {
priData, errECC = ioutil.ReadFile(filepath.Join(pathcaeccpemp384, caPriKeyFileName))
if nil != errECC {
t.Error(errECC)
}
_, errCA = CA().GenerateRSACertificateRequestWithPass(&CertRequest{
PrivateKeyData: priData,
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
SignatureAlgorithm: x509.SHA256WithRSAPSS,
Subject: CAMockSubject,
}, "123", CryptoRSA().PKSC1())
t.Log(errCA)
}

func TestCACommon_GenerateRSACertificateRequestFPWithPass_Fail(t *testing.T) {
_, errCA = CA().GenerateRSACertificateRequestFPWithPass(&CertRequestFP{
PrivateKeyFilePath: "",
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
SignatureAlgorithm: x509.SHA256WithRSAPSS,
Subject: CAMockSubject,
}, "123", CryptoRSA().PKSC1())
t.Log(errCA)
}

func TestCACommon_GenerateECCCertificateRequest_Fail(t *testing.T) {
_, errCA = CA().GenerateECCCertificateRequest(&CertRequest{
PrivateKeyData: priData,
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
SignatureAlgorithm: x509.SHA256WithRSAPSS,
Subject: CAMockSubject,
})
t.Log(errCA)
}

func TestCACommon_GenerateECCCertificateRequestFP_Fail(t *testing.T) {
_, errCA = CA().GenerateECCCertificateRequestFP(&CertRequestFP{
PrivateKeyFilePath: "",
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
SignatureAlgorithm: x509.SHA256WithRSAPSS,
Subject: CAMockSubject,
})
t.Log(errCA)
}

func TestCACommon_GenerateCertificateRequest_Fail(t *testing.T) {
_, errCA = CA().GenerateCertificateRequest(&CertRequestModel{
CertificateRequestFilePath: filepath.Join(pathcarsapksc1512, caCertificateRequestFileName),
})
t.Log(errCA)
}
2 changes: 2 additions & 0 deletions doc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
//
// gnomon.CryptoDES(). … // DES
//
// gnomon.CA(). … // CA
//
// gnomon.Log(). … // 日志
//
// gnomon.Scale(). … // 算数/转换
Expand Down
Loading

0 comments on commit 645ccfd

Please sign in to comment.