Skip to content

Commit

Permalink
[v15] Bump OpenSSL to 3.0.15, downgrade libfido to 1.13.0
Browse files Browse the repository at this point in the history
Bump OpenSSL to 3.0.15 in thirdparty-libs.mk as this change has already
been backported from master.

Downgrade libfido to 1.13.0 as that is the version used on branch/v15.
  • Loading branch information
camscale committed Sep 24, 2024
1 parent 0bbb04a commit 681861d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.assets/buildbox/pkgconfig/libcrypto-static.pc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ modulesdir=${libdir}/ossl-modules

Name: OpenSSL-libcrypto
Description: OpenSSL cryptography library
Version: 3.0.13
Version: 3.0.15
Libs: ${libdir}/libcrypto.a -ldl -pthread
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion build.assets/buildbox/pkgconfig/libfido2-static.pc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ includedir=${prefix}/include
Name: libfido2
Description: A FIDO2 library
URL: https://github.com/yubico/libfido2
Version: 1.14.0
Version: 1.13.0
Requires: libcrypto-static
# libfido2, libcbor and libudev combined here for simplicity.
Libs: ${libdir}/libfido2.a ${libdir}/libcbor.a ${libdir}/libudev.a -pthread
Expand Down
8 changes: 4 additions & 4 deletions build.assets/buildbox/thirdparty-libs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ tp-build-libcbor: fetch-git-libcbor
# -----------------------------------------------------------------------------
# openssl

openssl_VERSION = 3.0.13
openssl_VERSION = 3.0.15
openssl_GIT_REF = openssl-$(openssl_VERSION)
openssl_GIT_REF_HASH = 85cf92f55d9e2ac5aacf92bedd33fb890b9f8b4c
openssl_GIT_REF_HASH = c523121f902fde2929909dc7f76b13ceb4961efe
openssl_GIT_REPO = https://github.com/openssl/openssl
openssl_SRCDIR = $(call tp-src-dir,openssl)

Expand All @@ -188,9 +188,9 @@ tp-build-openssl: fetch-git-openssl
# -----------------------------------------------------------------------------
# libfido2

libfido2_VERSION = 1.14.0
libfido2_VERSION = 1.13.0
libfido2_GIT_REF = $(libfido2_VERSION)
libfido2_GIT_REF_HASH = 1a9d335c8f0e821f9eff27482fdda96e59a4f577
libfido2_GIT_REF_HASH = 486a8f8667e42f55cee2bba301b41433cacec830
libfido2_GIT_REPO = https://github.com/Yubico/libfido2
libfido2_SRCDIR = $(call tp-src-dir,libfido2)

Expand Down

0 comments on commit 681861d

Please sign in to comment.