From 356f7c92b464b69be3a2a898cd98a63037eeadcc Mon Sep 17 00:00:00 2001
From: Harm Weites <harmw@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:39:23 +0100
Subject: [PATCH] fix: match OpenSSL letter releases (#2682)

* chore: match openssl 1.1 letter releases

Signed-off-by: Harm Weites <harm@weites.com>

* chore: include image sha

Signed-off-by: Harm Weites <harm@weites.com>

---------

Signed-off-by: Harm Weites <harm@weites.com>
---
 syft/pkg/cataloger/binary/cataloger_test.go       |  11 +++++++++++
 syft/pkg/cataloger/binary/default_classifiers.go  |   3 ++-
 .../snippets/openssl/1.1.1w/linux-arm64/openssl   | Bin 0 -> 350 bytes
 .../cataloger/binary/test-fixtures/config.yaml    |   8 ++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/openssl/1.1.1w/linux-arm64/openssl

diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go
index b390bde5eff..fb94a3cc9ac 100644
--- a/syft/pkg/cataloger/binary/cataloger_test.go
+++ b/syft/pkg/cataloger/binary/cataloger_test.go
@@ -864,6 +864,17 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
 				Metadata:  metadata("openssl-binary"),
 			},
 		},
+		{
+			logicalFixture: "openssl/1.1.1w/linux-arm64",
+			expected: pkg.Package{
+				Name:      "openssl",
+				Version:   "1.1.1w",
+				Type:      "binary",
+				PURL:      "pkg:generic/openssl@1.1.1w",
+				Locations: locations("openssl"),
+				Metadata:  metadata("openssl-binary"),
+			},
+		},
 		{
 			logicalFixture: "gcc/12.3.0/linux-amd64",
 			expected: pkg.Package{
diff --git a/syft/pkg/cataloger/binary/default_classifiers.go b/syft/pkg/cataloger/binary/default_classifiers.go
index 381d08df25a..0917218df3a 100644
--- a/syft/pkg/cataloger/binary/default_classifiers.go
+++ b/syft/pkg/cataloger/binary/default_classifiers.go
@@ -386,7 +386,8 @@ func DefaultClassifiers() []Classifier {
 			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])?)`,
+				// [NUL]OpenSSL 1.1.1w'
+				`\x00OpenSSL (?P<version>[0-9]+\.[0-9]+\.[0-9]+([a-z]|-alpha[0-9]|-beta[0-9]|-rc[0-9])?)`,
 			),
 			Package: "openssl",
 			PURL:    mustPURL("pkg:generic/openssl@version"),
diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/openssl/1.1.1w/linux-arm64/openssl b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/openssl/1.1.1w/linux-arm64/openssl
new file mode 100644
index 0000000000000000000000000000000000000000..a368fcdd1845666c441bc18591e4a730ae486b73
GIT binary patch
literal 350
zcmXv}NooTz5cFBEXfTH45Tn*Mmfm2<VP2r6WeX<KFj8Xt`<TS8I@Ur}^<U(mtyFto
zSj)N7aG)(}G;E=I8CM4=IP0~nD~<W;g*FbniqmA0RS7jEB{|p9T4AK6EVxfxP>_>E
ziKm3#Vo0ZyCz~=SZ<7)%mxW$s#4%fAPca&$y$OM12tj3!No6G>1xgW<<x&!cn04Zl
zHl&mhmUy;|?e}{K_d)QS38O)7%hGP}kl3KD!=?OCJ+j>spO4S;d<Hx|cmqI$nN|>7
v$Un!S!`r!p&2M)HhyMNwwsn+Ny94+ynu$`W7wGMKi{y6D`bS?WmR#a5i#uR~

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/test-fixtures/config.yaml b/syft/pkg/cataloger/binary/test-fixtures/config.yaml
index 98f29f6346a..8224bcfeb99 100644
--- a/syft/pkg/cataloger/binary/test-fixtures/config.yaml
+++ b/syft/pkg/cataloger/binary/test-fixtures/config.yaml
@@ -462,3 +462,11 @@ from-images:
         platform: linux/amd64
     paths:
       - /bin/consul
+
+  - name: openssl
+    version: 1.1.1w
+    images:
+      - ref: openresty/openresty:1.25.3.1-2-alpine@sha256:b1cb45b1556801b8cb1bc29ea78faf2eaf67926a37b052dd070866e44d7df07a
+        platform: linux/arm64
+    paths:
+      - /usr/local/openresty/openssl/bin/openssl