Skip to content

Commit 495c89c

Browse files
authored
Add the krb5 patch to fix CVE-2024-37370 (#65)
Add the krb5 patch to fix CVE-2024-37370 See more detail: krb5/krb5@55fbf43
1 parent fe7eb30 commit 495c89c

File tree

8 files changed

+723
-5
lines changed

8 files changed

+723
-5
lines changed

.azure-pipelines/test-multiarch.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ set -ex
55
export ARCH=armhf
66

77
# Install packages
8-
apt-get update && apt-get install -y sudo
98
sudo mkdir -p $HOME
109

1110
# Make SymCrypt and OpenSSL

.azure-pipelines/test-template-armhf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- job: QemuTest
2323
dependsOn: Build${{ parameters.arch }}
2424
displayName: Qemu-test-${{ parameters.arch }}
25-
pool: sonicbld
25+
pool: sonicbld-1es
2626
timeoutInMinutes: 600
2727
steps:
2828
- script: |
@@ -41,7 +41,7 @@ jobs:
4141
displayName: 'Show download pacakges'
4242
- script: |
4343
set -ex
44-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
44+
sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
4545
pushd .azure-pipelines
4646
DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io/ ARCH=${{ parameters.arch }} DIST=${{ parameters.dist }} j2 Dockerfile.j2 > Dockerfile
4747
docker build --build-arg user=$USER --build-arg uid=$(id -u) --build-arg guid=$(id -g) --build-arg hostname=$HOSTNAME -t build-agent .

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ schedules:
99
branches:
1010
include:
1111
- main
12+
- 202205
1213
always: true
1314

1415
trigger: none

rules/krb5.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# krb5
22

3-
KRB5_VERSION = 1.18.3-6+deb11u4
3+
KRB5_VERSION = 1.18.3-6+deb11u5
44
KRB5_VERSION_FIPS = $(KRB5_VERSION)+fips
55
KRB5 = libk5crypto3_$(KRB5_VERSION_FIPS)_$(ARCH).deb
66
$(KRB5)_SRC_PATH = $(SRC_PATH)/krb5

rules/symcrypt-openssl.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SYMCRYPT_OPENSSL
22

3-
SYMCRYPT_OPENSSL_VERSION = 0.12
3+
SYMCRYPT_OPENSSL_VERSION = 0.13
44
SYMCRYPT_OPENSSL = symcrypt-openssl_$(SYMCRYPT_OPENSSL_VERSION)_$(ARCH).deb
55
$(SYMCRYPT_OPENSSL)_SRC_PATH = $(SRC_PATH)/SymCrypt-OpenSSL-Debian
66
$(SYMCRYPT_OPENSSL)_MAKEFILE = Makefile

0 commit comments

Comments
 (0)