detect is md4 and md5 are supported

Author: qmuntal

evp.go

@@ -70,9 +70,7 @@ func cryptoHashToMD(ch crypto.Hash) (md C.GO_EVP_MD_PTR) {
 			return C.go_openssl_EVP_md5_sha1()
 		}
 	}
-	if !SupportsHash(ch) {
-		return nil
-	}
+	sha3Defined := vMajor > 1 || (vMajor >= 1 && vMinor > 1) || (vMajor >= 1 && vMinor >= 1 && vPatch >= 1)
 	switch ch {
 	case crypto.MD4:
 		return C.go_openssl_EVP_md4()
@@ -89,13 +87,21 @@ func cryptoHashToMD(ch crypto.Hash) (md C.GO_EVP_MD_PTR) {
 	case crypto.SHA512:
 		return C.go_openssl_EVP_sha512()
 	case crypto.SHA3_224:
-		return C.go_openssl_EVP_sha3_224()
+		if sha3Defined {
+			return C.go_openssl_EVP_sha3_224()
+		}
 	case crypto.SHA3_256:
-		return C.go_openssl_EVP_sha3_256()
+		if sha3Defined {
+			return C.go_openssl_EVP_sha3_256()
+		}
 	case crypto.SHA3_384:
-		return C.go_openssl_EVP_sha3_384()
+		if sha3Defined {
+			return C.go_openssl_EVP_sha3_384()
+		}
 	case crypto.SHA3_512:
-		return C.go_openssl_EVP_sha3_512()
+		if sha3Defined {
+			return C.go_openssl_EVP_sha3_512()
+		}
 	}
 	return nil
 }

sha.go

@@ -79,15 +79,7 @@ func SHA512(p []byte) (sum [64]byte) {
 
 // SupportsHash returns true if a hash.Hash implementation is supported for h.
 func SupportsHash(h crypto.Hash) bool {
-	switch h {
-	case crypto.MD4, crypto.MD5, crypto.SHA1, crypto.SHA224, crypto.SHA256, crypto.SHA384, crypto.SHA512:
-		return true
-	case crypto.SHA3_224, crypto.SHA3_256, crypto.SHA3_384, crypto.SHA3_512:
-		return vMajor > 1 ||
-			(vMajor >= 1 && vMinor > 1) ||
-			(vMajor >= 1 && vMinor >= 1 && vPatch >= 1)
-	}
-	return false
+	return cryptoHashToMD(h) != nil
 }
 
 func SHA3_224(p []byte) (sum [28]byte) {

sha_test.go

@@ -8,7 +8,6 @@ import (
 	"encoding"
 	"hash"
 	"io"
-	"strings"
 	"testing"
 
 	"github.com/golang-fips/openssl/v2"
@@ -44,27 +43,30 @@ func cryptoToHash(h crypto.Hash) func() hash.Hash {
 
 func TestSha(t *testing.T) {
 	msg := []byte("testing")
-	var tests = []crypto.Hash{
-		crypto.MD4,
-		crypto.MD5,
-		crypto.SHA1,
-		crypto.SHA224,
-		crypto.SHA256,
-		crypto.SHA384,
-		crypto.SHA512,
-		crypto.SHA3_224,
-		crypto.SHA3_256,
-		crypto.SHA3_384,
-		crypto.SHA3_512,
+	var tests = []struct {
+		h            crypto.Hash
+		hasMarshaler bool
+	}{
+		{crypto.MD4, false},
+		{crypto.MD5, true},
+		{crypto.SHA1, true},
+		{crypto.SHA224, true},
+		{crypto.SHA256, true},
+		{crypto.SHA384, true},
+		{crypto.SHA512, true},
+		{crypto.SHA3_224, false},
+		{crypto.SHA3_256, false},
+		{crypto.SHA3_384, false},
+		{crypto.SHA3_512, false},
 	}
 	for _, tt := range tests {
 		tt := tt
-		t.Run(tt.String(), func(t *testing.T) {
+		t.Run(tt.h.String(), func(t *testing.T) {
 			t.Parallel()
-			if !openssl.SupportsHash(tt) {
+			if !openssl.SupportsHash(tt.h) {
 				t.Skip("skipping: not supported")
 			}
-			h := cryptoToHash(tt)()
+			h := cryptoToHash(tt.h)()
 			initSum := h.Sum(nil)
 			n, err := h.Write(msg)
 			if err != nil {
@@ -80,12 +82,12 @@ func TestSha(t *testing.T) {
 			if bytes.Equal(sum, initSum) {
 				t.Error("Write didn't change internal hash state")
 			}
-			if name := tt.String(); name != "MD4" && !strings.HasPrefix(name, "SHA3-") {
+			if tt.hasMarshaler {
 				state, err := h.(encoding.BinaryMarshaler).MarshalBinary()
 				if err != nil {
 					t.Errorf("could not marshal: %v", err)
 				}
-				h2 := cryptoToHash(tt)()
+				h2 := cryptoToHash(tt.h)()
 				if err := h2.(encoding.BinaryUnmarshaler).UnmarshalBinary(state); err != nil {
 					t.Errorf("could not unmarshal: %v", err)
 				}