From 63e7a004cb50b25d04852978bd65b35023d2a03d Mon Sep 17 00:00:00 2001
From: Laurent Goderre <laurent.goderre@docker.com>
Date: Fri, 22 Dec 2023 09:37:09 -0500
Subject: [PATCH] Added OpenSSL binary matcher (#2416)

* Added OpenSSL binary matcher

Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>

* chore: strip binary to smaller detection

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>

---------

Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Co-authored-by: Christopher Phillips <christopher.phillips@anchore.com>
---
 syft/pkg/cataloger/binary/cataloger_test.go      |  12 ++++++++++++
 syft/pkg/cataloger/binary/default_classifiers.go |  11 +++++++++++
 .../classifiers/positive/openssl-3.1.4/openssl   | Bin 0 -> 1414 bytes
 3 files changed, 23 insertions(+)
 create mode 100755 syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/openssl-3.1.4/openssl

diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go
index e7aa36cd8..d38de2e41 100644
--- a/syft/pkg/cataloger/binary/cataloger_test.go
+++ b/syft/pkg/cataloger/binary/cataloger_test.go
@@ -763,6 +763,18 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 				Metadata:  metadata("bash-binary"),
 			},
 		},
+		{
+			name:       "positive-openssl-3.1.4",
+			fixtureDir: "test-fixtures/classifiers/positive/openssl-3.1.4",
+			expected: pkg.Package{
+				Name:      "openssl",
+				Version:   "3.1.4",
+				Type:      "binary",
+				PURL:      "pkg:generic/openssl@3.1.4",
+				Locations: locations("openssl"),
+				Metadata:  metadata("openssl-binary"),
+			},
+		},
 	}
 
 	for _, test := range tests {
diff --git a/syft/pkg/cataloger/binary/default_classifiers.go b/syft/pkg/cataloger/binary/default_classifiers.go
index e3ecd58b1..95376052f 100644
--- a/syft/pkg/cataloger/binary/default_classifiers.go
+++ b/syft/pkg/cataloger/binary/default_classifiers.go
@@ -334,6 +334,17 @@ var defaultClassifiers = []classifier{
 		PURL:    mustPURL("pkg:generic/bash@version"),
 		CPEs:    singleCPE("cpe:2.3:a:gnu:bash:*:*:*:*:*:*:*:*"),
 	},
+	{
+		Class:    "openssl-binary",
+		FileGlob: "**/openssl",
+		EvidenceMatcher: fileContentsVersionMatcher(
+			// [NUL]OpenSSL 3.1.4'
+			`\x00OpenSSL (?P<version>[0-9]+\.[0-9]+\.[0-9]+(-alpha[0-9]|-beta[0-9]|-rc[0-9])?)`,
+		),
+		Package: "openssl",
+		PURL:    mustPURL("pkg:generic/openssl@version"),
+		CPEs:    singleCPE("cpe:2.3:a:openssl:openssl:*:*:*:*:*:*:*:*"),
+	},
 }
 
 // in both binaries and shared libraries, the version pattern is [NUL]3.11.2[NUL]
diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/openssl-3.1.4/openssl b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/openssl-3.1.4/openssl
new file mode 100755
index 0000000000000000000000000000000000000000..a2fc1b69127e1b5c49759c7b986c0301a30c3344
GIT binary patch
literal 1414
zcmbVMO>Yx15Vbh=hJ?g{%UmK-sVQw!kSM)GX_1f$jT(AJ&U$uZ$!o7{Z$tQZ2nmTR
zKY$;>g(J+^+a`hZ!X7s3$$Y$d^TtBt2cS1Nd>-g0?6Bnu3s+hF2^AFRqb_wJBSPbh
zE|y?rjp2kHqi;jpbP62r;v7AUuP)L_h+a5>v9#7jXamCFHg2Kg90uc2sSWP&M<dDL
zJb#AhJSH?kOuV)c@MH86v@M;lWz^1soVhjv6$96xPqqLv)V2aTvmdH`!ZQM{0Ir1F
z%4=;A#t|s(v7m}ec4FrM3EX!7>#H{q9Y{zZ@6UVYfO|Ghs)SNuDO*E`xA2y#GI{iD
z#BKHUuHMLahyOq0*ZIg@aiSG(t=)z>6{8nTnmH4%ndQRSD7EDwI7_5^sA-a{hNl7g
z+QQ`gE#w*QGK<Vkm*_q5uiV12iQ_3|W8M_CF312kS~3lq#CA3TB#;_uo?-45ABs7l
z$cfK%XpCHL<XUNGt#`;l<CW<9A%VO>ugfL$UBkkY<`t1d5LwO&lH3<M;4YOr6+eG3
zgcC++@kJbpp{T?U@m+iqU&ZIH&v(y8>FcsVJDpy@aQ|@s7><tNvWReWa5U`vdPLZT
zo_Xn)C$yWp-8zVjf|jcDn<6H@f@^(&?3z8N!~;lUK*=b{H=Sp#Hi|8n&or-6S8ZOO
z)go}}<d3$}miA#yV#!`R)$*SFZ7*EikPbYQMphv))WOX8f~%1x5z!Nm30Yh=yur+D
zzA#e$D1C(yGF%#8WX<GE>3=V+qAdtr@BhS`OdQbY0%gAIXFR#4pcqMDAt^$L2fz9c
z5B5%9z8LnNJbom^x%Z^BbOEf3gTy)`eP?md+y@Zmt|c<b8qk!3peu`N=f3y>U`pIm
NAR{Pj=(6jnoj)=y#8UtO

literal 0
HcmV?d00001