Skip to content

align "Signature Algorithm" in Data correctly and delete redundant code #8

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

Open
wrype wants to merge 1 commit into
base: master
Choose a base branch
from
Open

align "Signature Algorithm" in Data correctly and delete redundant code #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions certinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func printSubjectInformation(subj *pkix.Name, pkAlgo x509.PublicKeyAlgorithm, pk
buf.WriteString(fmt.Sprintf("%8sSubject Public Key Info:\n%12sPublic Key Algorithm: ", "", ""))
switch pkAlgo {
case x509.RSA:
buf.WriteString(fmt.Sprintf("RSA\n"))
buf.WriteString("RSA\n")
if rsaKey, ok := pk.(*rsa.PublicKey); ok {
buf.WriteString(fmt.Sprintf("%16sPublic-Key: (%d bit)\n", "", rsaKey.N.BitLen()))
// Some implementations (notably OpenSSL) prepend 0x00 to the modulus
Expand All @@ -153,7 +153,7 @@ func printSubjectInformation(subj *pkix.Name, pkAlgo x509.PublicKeyAlgorithm, pk
return errors.New("certinfo: Expected rsa.PublicKey for type x509.RSA")
}
case x509.DSA:
buf.WriteString(fmt.Sprintf("DSA\n"))
buf.WriteString("DSA\n")
if dsaKey, ok := pk.(*dsa.PublicKey); ok {
dsaKeyPrinter("pub", dsaKey.Y, buf)
dsaKeyPrinter("P", dsaKey.P, buf)
Expand All @@ -163,7 +163,7 @@ func printSubjectInformation(subj *pkix.Name, pkAlgo x509.PublicKeyAlgorithm, pk
return errors.New("certinfo: Expected dsa.PublicKey for type x509.DSA")
}
case x509.ECDSA:
buf.WriteString(fmt.Sprintf("ECDSA\n"))
buf.WriteString("ECDSA\n")
if ecdsaKey, ok := pk.(*ecdsa.PublicKey); ok {
buf.WriteString(fmt.Sprintf("%16sPublic-Key: (%d bit)\n", "", ecdsaKey.Params().BitSize))
dsaKeyPrinter("X", ecdsaKey.X, buf)
Expand Down Expand Up @@ -256,11 +256,11 @@ func CertificateText(cert *x509.Certificate) (string, error) {
var buf bytes.Buffer
buf.Grow(4096) // 4KiB should be enough

buf.WriteString(fmt.Sprintf("Certificate:\n"))
buf.WriteString("Certificate:\n")
buf.WriteString(fmt.Sprintf("%4sData:\n", ""))
printVersion(cert.Version, &buf)
buf.WriteString(fmt.Sprintf("%8sSerial Number: %d (%#x)\n", "", cert.SerialNumber, cert.SerialNumber))
buf.WriteString(fmt.Sprintf("%4sSignature Algorithm: %s\n", "", cert.SignatureAlgorithm))
buf.WriteString(fmt.Sprintf("%8sSignature Algorithm: %s\n", "", cert.SignatureAlgorithm))

// Issuer information
buf.WriteString(fmt.Sprintf("%8sIssuer: ", ""))
Expand All @@ -280,7 +280,7 @@ func CertificateText(cert *x509.Certificate) (string, error) {
// Issuer/Subject Unique ID, typically used in old v2 certificates
issuerUID, subjectUID, err := certUniqueIDs(cert.RawTBSCertificate)
if err != nil {
return "", errors.New(fmt.Sprintf("certinfo: Error parsing TBS unique attributes: %s\n", err.Error()))
return "", fmt.Errorf("certinfo: Error parsing TBS unique attributes: %w", err)
}
if len(issuerUID) > 0 {
buf.WriteString(fmt.Sprintf("%8sIssuer Unique ID: %02x", "", issuerUID[0]))
Expand Down Expand Up @@ -369,7 +369,7 @@ func CertificateText(cert *x509.Certificate) (string, error) {
buf.WriteString(fmt.Sprintf("%16sCA:FALSE", ""))
}
if cert.MaxPathLenZero {
buf.WriteString(fmt.Sprintf(", pathlen:0\n"))
buf.WriteString(", pathlen:0\n")
} else if cert.MaxPathLen > 0 {
buf.WriteString(fmt.Sprintf(", pathlen:%d\n", cert.MaxPathLen))
} else {
Expand Down Expand Up @@ -548,7 +548,7 @@ func CertificateRequestText(csr *x509.CertificateRequest) (string, error) {
var buf bytes.Buffer
buf.Grow(4096) // 4KiB should be enough

buf.WriteString(fmt.Sprintf("Certificate Request:\n"))
buf.WriteString("Certificate Request:\n")
buf.WriteString(fmt.Sprintf("%4sData:\n", ""))
printVersion(csr.Version, &buf)

Expand Down
2 changes: 1 addition & 1 deletion test_certs/leaf1.cert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 2 (0x2)
Signature Algorithm: sha256WithRSAEncryption
Signature Algorithm: sha256WithRSAEncryption
Issuer: C=US, ST=California, O=World Widget Authority, OU=Identity Affairs, CN=worldwidgetauthority.com/emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 GMT
Expand Down
2 changes: 1 addition & 1 deletion test_certs/leaf1.cert.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 2 (0x2)
Signature Algorithm: SHA256-RSA
Signature Algorithm: SHA256-RSA
Issuer: C=US,ST=California,O=World Widget Authority,OU=Identity Affairs,CN=worldwidgetauthority.com,emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 UTC
Expand Down
2 changes: 1 addition & 1 deletion test_certs/leaf2.cert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 3 (0x3)
Signature Algorithm: sha256WithRSAEncryption
Signature Algorithm: sha256WithRSAEncryption
Issuer: C=US, ST=California, O=World Widget Authority, OU=Identity Affairs, CN=worldwidgetauthority.com/emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 GMT
Expand Down
2 changes: 1 addition & 1 deletion test_certs/leaf2.cert.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 3 (0x3)
Signature Algorithm: SHA256-RSA
Signature Algorithm: SHA256-RSA
Issuer: C=US,ST=California,O=World Widget Authority,OU=Identity Affairs,CN=worldwidgetauthority.com,emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 UTC
Expand Down
2 changes: 1 addition & 1 deletion test_certs/leaf3.cert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 4 (0x4)
Signature Algorithm: sha256WithRSAEncryption
Signature Algorithm: sha256WithRSAEncryption
Issuer: C=US, ST=California, O=World Widget Authority, OU=Identity Affairs, CN=worldwidgetauthority.com/emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 GMT
Expand Down
2 changes: 1 addition & 1 deletion test_certs/leaf3.cert.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 4 (0x4)
Signature Algorithm: SHA256-RSA
Signature Algorithm: SHA256-RSA
Issuer: C=US,ST=California,O=World Widget Authority,OU=Identity Affairs,CN=worldwidgetauthority.com,emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 UTC
Expand Down
2 changes: 1 addition & 1 deletion test_certs/root1.cert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 1 (0x1)
Signature Algorithm: sha256WithRSAEncryption
Signature Algorithm: sha256WithRSAEncryption
Issuer: C=US, ST=California, O=World Widget Authority, OU=Identity Affairs, CN=worldwidgetauthority.com/emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 GMT
Expand Down
2 changes: 1 addition & 1 deletion test_certs/root1.cert.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number: 1 (0x1)
Signature Algorithm: SHA256-RSA
Signature Algorithm: SHA256-RSA
Issuer: C=US,ST=California,O=World Widget Authority,OU=Identity Affairs,CN=worldwidgetauthority.com,emailAddress=nobody@worldwidgetauthority.com
Validity
Not Before: Jul 23 18:56:47 2020 UTC
Expand Down