Skip to content

Add more modern crypto algorithms #4

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
andrew-ar wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add more modern crypto algorithms #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87c7a30
Add more crypto algorithms
andrew-ar Feb 23, 2024
849ab65
Better handle empty alg for ECDSA case
andrew-ar Feb 23, 2024
15598de
Fix error message, add SHA224 digest
andrew-ar Feb 23, 2024
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
36 changes: 33 additions & 3 deletions xmlsig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import (
"crypto"
"crypto/rand"
"errors"

// import supported crypto hash function
_ "crypto/sha1"
_ "crypto/sha256"
_ "crypto/sha512"
"crypto/tls"
"crypto/x509"
"encoding/base64"
Expand Down Expand Up @@ -47,10 +49,16 @@ func pickSignatureAlgorithm(certType x509.PublicKeyAlgorithm, alg string) (*algo
hash = crypto.SHA1
case "http://www.w3.org/2000/09/xmldsig#rsa-sha1":
hash = crypto.SHA1
case "http://www.w3.org/2001/04/xmldsig-more#rsa-sha224":
hash = crypto.SHA224
case "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256":
hash = crypto.SHA256
case "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384":
hash = crypto.SHA384
case "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512":
hash = crypto.SHA512
default:
return nil, errors.New("xmlsig does not currently the specfied algorithm for RSA certificates")
return nil, errors.New("xmlsig does not currently support the specfied algorithm for RSA certificates")
}
case x509.DSA:
switch alg {
Expand All @@ -62,10 +70,26 @@ func pickSignatureAlgorithm(certType x509.PublicKeyAlgorithm, alg string) (*algo
case "http://www.w3.org/2009/xmldsig11#dsa-sha256":
hash = crypto.SHA256
default:
return nil, errors.New("xmlsig does not currently the specfied algorithm for DSA certificates")
return nil, errors.New("xmlsig does not currently support the specfied algorithm for DSA certificates")
}
case x509.ECDSA:
return nil, errors.New("xmlsig does not currently support ECDSA certificates")
switch alg {
case "":
alg = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"
hash = crypto.SHA1
case "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1":
hash = crypto.SHA1
case "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224":
hash = crypto.SHA224
case "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256":
hash = crypto.SHA256
case "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384":
hash = crypto.SHA384
case "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512":
hash = crypto.SHA512
default:
return nil, errors.New("xmlsig does not currently support the specfied algorithm for ECDSA certificates")
}
default:
return nil, errors.New("xmlsig needs some work to support your certificate")
}
Expand All @@ -78,8 +102,14 @@ func pickDigestAlgorithm(alg string) (*algorithm, error) {
fallthrough
case "http://www.w3.org/2000/09/xmldsig#sha1":
return &algorithm{"http://www.w3.org/2000/09/xmldsig#sha1", crypto.SHA1}, nil
case "http://www.w3.org/2001/04/xmldsig-more#sha224":
return &algorithm{"http://www.w3.org/2001/04/xmldsig-more#sha224", crypto.SHA224}, nil
case "http://www.w3.org/2001/04/xmlenc#sha256":
return &algorithm{"http://www.w3.org/2001/04/xmlenc#sha256", crypto.SHA256}, nil
case "http://www.w3.org/2001/04/xmldsig-more#sha384":
return &algorithm{"http://www.w3.org/2001/04/xmldsig-more#sha384", crypto.SHA384}, nil
case "http://www.w3.org/2001/04/xmlenc#sha512":
return &algorithm{"http://www.w3.org/2001/04/xmlenc#sha512", crypto.SHA512}, nil
}
return nil, errors.New("xmlsig does not support the specified digest algorithm")
}
Expand Down