Skip to content

Support serializing SymCrypt hash objects #278

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
qmuntal merged 11 commits into from
May 27, 2025
Merged

Support serializing SymCrypt hash objects #278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a76325
support serializing SymCrypt hash objects
qmuntal May 15, 2025
ad6c0bf
fix function signatures
qmuntal May 15, 2025
1ae93ae
fix tests
qmuntal May 15, 2025
ce8b1a7
fix tests
qmuntal May 15, 2025
baed898
fix cgoless build
qmuntal May 15, 2025
a689068
fix headers
qmuntal May 15, 2025
b957509
fix sha512 buffer length
qmuntal May 21, 2025
cc31f89
return err
qmuntal May 23, 2025
66cbbca
pass magic as parameter
qmuntal May 23, 2025
0bf146c
simplify
qmuntal May 23, 2025
dd36184
reduce diffs
qmuntal May 26, 2025
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
Prev Previous commit
Next Next commit
pass magic as parameter
  • Loading branch information
@qmuntal
qmuntal committed May 23, 2025
commit 66cbbca11f8863303454cefe1b62ba74be4a8f3f
11 changes: 6 additions & 5 deletions hash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,14 +392,15 @@ func (d *evpHash) MarshalBinary() ([]byte, error) {
func (d *evpHash) AppendBinary(buf []byte) ([]byte, error) {
defer runtime.KeepAlive(d)
d.init()
if magic, _ := cryptoHashEncodingInfo(d.alg.ch); magic == "" {
magic, _ := cryptoHashEncodingInfo(d.alg.ch)
if magic == "" {
return nil, errHashNotMarshallable
}
switch d.alg.provider {
case providerOSSLDefault, providerOSSLFIPS:
return osslHashAppendBinary(d.ctx, d.alg.ch, buf)
return osslHashAppendBinary(d.ctx, d.alg.ch, magic, buf)
case providerSymCrypt:
return symCryptHashAppendBinary(d.ctx, d.alg.ch, buf)
return symCryptHashAppendBinary(d.ctx, d.alg.ch, magic, buf)
default:
return nil, errHashNotMarshallable
}
Expand All @@ -420,9 +421,9 @@ func (d *evpHash) UnmarshalBinary(b []byte) error {
}
switch d.alg.provider {
case providerOSSLDefault, providerOSSLFIPS:
return osslHashUnmarshalBinary(d.ctx, d.alg.ch, b)
return osslHashUnmarshalBinary(d.ctx, d.alg.ch, magic, b)
case providerSymCrypt:
return symCryptHashUnmarshalBinary(d.ctx, d.alg.ch, b)
return symCryptHashUnmarshalBinary(d.ctx, d.alg.ch, magic, b)
default:
return errHashNotMarshallable
}
Expand Down
6 changes: 2 additions & 4 deletions provideropenssl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,11 @@ func getOSSLDigetsContext(ctx ossl.EVP_MD_CTX_PTR) unsafe.Pointer {

var errHashStateInvalid = errors.New("openssl: can't retrieve hash state")

func osslHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, buf []byte) ([]byte, error) {
func osslHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, magic string, buf []byte) ([]byte, error) {
algctx := getOSSLDigetsContext(ctx)
if algctx == nil {
return nil, errHashStateInvalid
}
magic, _ := cryptoHashEncodingInfo(ch)
buf = append(buf, magic...)
switch ch {
case crypto.MD5:
Expand All @@ -215,12 +214,11 @@ func osslHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, buf []byte) (
}
}

func osslHashUnmarshalBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, b []byte) error {
func osslHashUnmarshalBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, magic string, b []byte) error {
algctx := getOSSLDigetsContext(ctx)
if algctx == nil {
return errHashStateInvalid
}
magic, _ := cryptoHashEncodingInfo(ch)
b = b[len(magic):]
switch ch {
case crypto.MD5:
Expand Down
6 changes: 2 additions & 4 deletions providersymcrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func (b *_SYMCRYPT_SHA512_STATE_EXPORT_BLOB) unmarshalBinary(d []byte) {
b.lengthL = symCryptUnmarshalBinary(d, b.chain[:], b.buffer[:])
}

func symCryptHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, buf []byte) ([]byte, error) {
func symCryptHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, magic string, buf []byte) ([]byte, error) {
size, typ, serializable := symCryptHashStateInfo(ch)
if !serializable {
return nil, errHashNotMarshallable
Expand Down Expand Up @@ -217,7 +217,6 @@ func symCryptHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, buf []byt
return nil, errors.New("invalid blob type")
}

magic, _ := cryptoHashEncodingInfo(ch)
buf = append(buf, magic...)
switch ch {
case crypto.MD5:
Expand All @@ -237,7 +236,7 @@ func symCryptHashAppendBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, buf []byt
}
}

func symCryptHashUnmarshalBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, b []byte) error {
func symCryptHashUnmarshalBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, magic string, b []byte) error {
size, typ, serializable := symCryptHashStateInfo(ch)
if !serializable {
return errHashNotMarshallable
Expand All @@ -248,7 +247,6 @@ func symCryptHashUnmarshalBinary(ctx ossl.EVP_MD_CTX_PTR, ch crypto.Hash, b []by
_type: typ,
}
var blobPtr unsafe.Pointer
magic, _ := cryptoHashEncodingInfo(ch)
b = b[len(magic):]
switch ch {
case crypto.MD5:
Expand Down
Loading