Skip to content

Upgrade openssl and krb5 to latest debian version #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
liuh-80 wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

Upgrade openssl and krb5 to latest debian version #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9c22c7
Remove krb5
liuh-80 Jan 21, 2025
4fb9414
Remove openssl
liuh-80 Jan 21, 2025
582bbd1
Download and build from debian source code
liuh-80 Jan 21, 2025
29b26f5
Fix script
liuh-80 Jan 21, 2025
8cad480
Update install-packages.sh
liuh-80 Jan 21, 2025
958ec40
Update build-template.yml
liuh-80 Jan 22, 2025
8bdddff
Update openssl.mk
liuh-80 Jan 22, 2025
16a1955
Update Makefile
liuh-80 Jan 22, 2025
b50bab9
Refactor Makefile and related scripts.
liuh-80 Jan 23, 2025
a4c6909
Update test-multiarch.sh
liuh-80 Jan 23, 2025
cf80461
Add Debian patch application logic
liuh-80 Jan 23, 2025
0bcd602
Update 40-Modify-tests-with-unsupported-behavior.patch
liuh-80 Jan 23, 2025
41af102
Refactor patch application and cleanup process
liuh-80 Jan 23, 2025
3e96867
Fix indentation in Makefile
liuh-80 Jan 23, 2025
10350e6
Update dget options in openssl and krb5 scripts
liuh-80 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ jobs:

sudo pip3 install --break-system-packages blurb

# Install dget for download debian package source code
sudo apt-get install -y devscripts

mkdir -p $(Pipeline.Workspace)/target
displayName: 'Install packages'
- checkout: self
Expand Down Expand Up @@ -96,10 +99,6 @@ jobs:
echo 40-Modify-tests-with-unsupported-behavior.patch >> src/openssl.patch/series
openssl engine -v | grep -i symcrypt
openssl list --providers | grep -i symcrypt
pushd src/openssl
git clean -xdf
git checkout -- .
popd

ARCH=${{ parameters.arch }} TARGET_PATH=target-test make openssl
echo 0 | sudo tee /etc/fips/fips_enable
Expand Down
3 changes: 3 additions & 0 deletions .azure-pipelines/install-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ sudo apt-get install -y dh-exec dh-runit libaudit-dev libedit-dev libfido2-dev l
sudo apt-get install -y libwrap0-dev pkg-config
sudo apt-get install -y libpam-dev libselinux1-dev libsystemd-dev libwrap0-dev

# Install dget for download debian package source code
sudo apt-get install -y devscripts

# Build Golang
sudo apt-get install -y golang

Expand Down
6 changes: 0 additions & 6 deletions .azure-pipelines/test-multiarch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ sudo mkdir -p /etc/fips
echo 1 | sudo tee /etc/fips/fips_enable
openssl engine -v | grep -i symcrypt

# Cleanup OpenSSL source folder
pushd src/openssl
git clean -xdf
git checkout -- .
popd

# Build the OpenSSL again with SymCrypt enabled
rm -f src/openssl/test/recipes/30-test_afalg.t
echo 40-Modify-tests-with-unsupported-behavior.patch >> src/openssl.patch/series
Expand Down
6 changes: 0 additions & 6 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
[submodule "src/golang-debian"]
path = src/golang-debian
url = https://salsa.debian.org/go-team/compiler/golang.git
[submodule "src/openssl"]
path = src/openssl
url = https://salsa.debian.org/debian/openssl
[submodule "src/krb5"]
path = src/krb5
url = https://salsa.debian.org/debian/krb5
[submodule "src/golang-fips"]
path = src/golang-fips
url = https://github.com/golang-fips/go
18 changes: 15 additions & 3 deletions rules/krb5.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
# krb5

KRB5_VERSION = 1.20.1-2+deb12u1
KRB5_VERSION_FIPS = $(KRB5_VERSION)+fips
KRB5_VERSION_MAIN = 1.20.1
KRB5_VERSION_FULL = $(KRB5_VERSION_MAIN)-2+deb12u2
KRB5_VERSION_FIPS = $(KRB5_VERSION_FULL)+fips
KRB5 = libk5crypto3_$(KRB5_VERSION_FIPS)_$(ARCH).deb
$(KRB5)_SRC_PATH = $(SRC_PATH)/krb5
KERB5_DST_PATH = krb5-$(KRB5_VERSION_MAIN)

# Download krb5 code
$(KRB5)_PRE_SCRIPT = rm -rf $(KERB5_DST_PATH); \
rm -rf $(SRC_PATH)/krb5; \
dget -u http://deb.debian.org/debian/pool/main/k/krb5/krb5_$(KRB5_VERSION_FULL).dsc; \
mv $(KERB5_DST_PATH) $(SRC_PATH)/krb5; \
pushd $(SRC_PATH)/krb5; \
quilt pop -a -f; \
rm -rf .pc; \
popd;

MAIN_TARGETS += $(KRB5)
$(KRB5)_DERIVED_DEBS =
$(KRB5)_DERIVED_DEBS =
16 changes: 14 additions & 2 deletions rules/openssl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
# openssl

OPENSSL_VERSION = 3.0.11-1~deb12u2
OPENSSL_VERSION_FIPS = $(OPENSSL_VERSION)+fips
OPENSSL_VERSION_MAIN = 3.0.15
OPENSSL_VERSION_FULL = $(OPENSSL_VERSION_MAIN)-1~deb12u1
OPENSSL_VERSION_FIPS = $(OPENSSL_VERSION_FULL)+fips
OPENSSL = openssl_$(OPENSSL_VERSION_FIPS)_$(ARCH).deb
$(OPENSSL)_SRC_PATH = $(SRC_PATH)/openssl
OPENSSL_DST_PATH = openssl-$(OPENSSL_VERSION_MAIN)

# Download openssl code
$(OPENSSL)_PRE_SCRIPT = rm -rf $(OPENSSL_DST_PATH); \
rm -rf $(SRC_PATH)/openssl; \
dget -u http://deb.debian.org/debian/pool/main/o/openssl/openssl_$(OPENSSL_VERSION_FULL).dsc; \
mv $(OPENSSL_DST_PATH) $(SRC_PATH)/openssl; \
pushd $(SRC_PATH)/openssl; \
quilt pop -a -f; \
rm -rf .pc; \
popd;

MAIN_TARGETS += $(OPENSSL)
$(OPENSSL)_DERIVED_DEBS = libssl3_$(OPENSSL_VERSION_FIPS)_$(ARCH).deb
Expand Down
1 change: 0 additions & 1 deletion src/krb5
Open in desktop
Submodule krb5 deleted from 029c5a
1 change: 0 additions & 1 deletion src/openssl
Open in desktop
Submodule openssl deleted from 5790e8
206 changes: 106 additions & 100 deletions src/openssl.patch/40-Modify-tests-with-unsupported-behavior.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c
index 1aabfef893b08..fb817f155f68f 100644
--- a/test/evp_pkey_provided_test.c
+++ b/test/evp_pkey_provided_test.c
@@ -346,102 +346,102 @@ static int test_print_key_using_encoder_public(const char *alg,
@@ -346,105 +346,105 @@ static int test_print_key_using_encoder_public(const char *alg,
#define DQ 6
#define QINV 7

-static int test_fromdata_rsa(void)
-{
- int ret = 0, i;
Expand Down Expand Up @@ -150,7 +150,7 @@ index 1aabfef893b08..fb817f155f68f 100644
- fromdata_params), 1))
- goto err;
-
- while (dup_pk == NULL) {
- for (;;) {
- ret = 0;
- if (!TEST_int_eq(EVP_PKEY_get_bits(pk), 32)
- || !TEST_int_eq(EVP_PKEY_get_security_bits(pk), 8)
Expand Down Expand Up @@ -178,7 +178,10 @@ index 1aabfef893b08..fb817f155f68f 100644
- ret = test_print_key_using_pem("RSA", pk)
- && test_print_key_using_encoder("RSA", pk);
-
- if (!ret || !TEST_ptr(dup_pk = EVP_PKEY_dup(pk)))
- if (!ret || dup_pk != NULL)
- break;
-
- if (!TEST_ptr(dup_pk = EVP_PKEY_dup(pk)))
- goto err;
- ret = ret && TEST_int_eq(EVP_PKEY_eq(pk, dup_pk), 1);
- EVP_PKEY_free(pk);
Expand All @@ -203,102 +206,105 @@ index 1aabfef893b08..fb817f155f68f 100644
-
- return ret;
-}
+// static int test_fromdata_rsa(void)
+// {
+// int ret = 0, i;
+// EVP_PKEY_CTX *ctx = NULL, *key_ctx = NULL;
+// EVP_PKEY *pk = NULL, *copy_pk = NULL, *dup_pk = NULL;
+// /*
+// * 32-bit RSA key, extracted from this command,
+// * executed with OpenSSL 1.0.2:
+// *
+// * openssl genrsa 32 | openssl rsa -text
+// */
+// static unsigned long key_numbers[] = {
+// 0xbc747fc5, /* N */
+// 0x10001, /* E */
+// 0x7b133399, /* D */
+// 0xe963, /* P */
+// 0xceb7, /* Q */
+// 0x8599, /* DP */
+// 0xbd87, /* DQ */
+// 0xcc3b, /* QINV */
+// };
+// OSSL_PARAM fromdata_params[] = {
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_N, &key_numbers[N]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_E, &key_numbers[E]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_D, &key_numbers[D]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_FACTOR1, &key_numbers[P]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_FACTOR2, &key_numbers[Q]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_EXPONENT1, &key_numbers[DP]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_EXPONENT2, &key_numbers[DQ]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &key_numbers[QINV]),
+// OSSL_PARAM_END
+// };
+// BIGNUM *bn = BN_new();
+// BIGNUM *bn_from = BN_new();
+
+// if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)))
+// goto err;
+
+// if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+// || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
+// fromdata_params), 1))
+// goto err;
+
+// while (dup_pk == NULL) {
+// ret = 0;
+// if (!TEST_int_eq(EVP_PKEY_get_bits(pk), 32)
+// || !TEST_int_eq(EVP_PKEY_get_security_bits(pk), 8)
+// || !TEST_int_eq(EVP_PKEY_get_size(pk), 4)
+// || !TEST_false(EVP_PKEY_missing_parameters(pk)))
+// goto err;
+
+// EVP_PKEY_CTX_free(key_ctx);
+// if (!TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, pk, "")))
+// goto err;
+
+// if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0)
+// || !TEST_int_gt(EVP_PKEY_public_check(key_ctx), 0)
+// || !TEST_int_gt(EVP_PKEY_private_check(key_ctx), 0)
+// || !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0))
+// goto err;
+
+// /* EVP_PKEY_copy_parameters() should fail for RSA */
+// if (!TEST_ptr(copy_pk = EVP_PKEY_new())
+// || !TEST_false(EVP_PKEY_copy_parameters(copy_pk, pk)))
+// goto err;
+// EVP_PKEY_free(copy_pk);
+// copy_pk = NULL;
+
+// ret = test_print_key_using_pem("RSA", pk)
+// && test_print_key_using_encoder("RSA", pk);
+
+// if (!ret || !TEST_ptr(dup_pk = EVP_PKEY_dup(pk)))
+// goto err;
+// ret = ret && TEST_int_eq(EVP_PKEY_eq(pk, dup_pk), 1);
+// EVP_PKEY_free(pk);
+// pk = dup_pk;
+// if (!ret)
+// goto err;
+// }
+// err:
+// /* for better diagnostics always compare key params */
+// for (i = 0; fromdata_params[i].key != NULL; ++i) {
+// if (!TEST_true(BN_set_word(bn_from, key_numbers[i]))
+// || !TEST_true(EVP_PKEY_get_bn_param(pk, fromdata_params[i].key, &bn))
+// || !TEST_BN_eq(bn, bn_from))
+// ret = 0;
+// }
+// BN_free(bn_from);
+// BN_free(bn);
+// EVP_PKEY_free(pk);
+// EVP_PKEY_free(copy_pk);
+// EVP_PKEY_CTX_free(key_ctx);
+// EVP_PKEY_CTX_free(ctx);
+
+// return ret;
+// }
+//static int test_fromdata_rsa(void)
+//{
+// int ret = 0, i;
+// EVP_PKEY_CTX *ctx = NULL, *key_ctx = NULL;
+// EVP_PKEY *pk = NULL, *copy_pk = NULL, *dup_pk = NULL;
+// /*
+// * 32-bit RSA key, extracted from this command,
+// * executed with OpenSSL 1.0.2:
+// *
+// * openssl genrsa 32 | openssl rsa -text
+// */
+// static unsigned long key_numbers[] = {
+// 0xbc747fc5, /* N */
+// 0x10001, /* E */
+// 0x7b133399, /* D */
+// 0xe963, /* P */
+// 0xceb7, /* Q */
+// 0x8599, /* DP */
+// 0xbd87, /* DQ */
+// 0xcc3b, /* QINV */
+// };
+// OSSL_PARAM fromdata_params[] = {
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_N, &key_numbers[N]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_E, &key_numbers[E]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_D, &key_numbers[D]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_FACTOR1, &key_numbers[P]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_FACTOR2, &key_numbers[Q]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_EXPONENT1, &key_numbers[DP]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_EXPONENT2, &key_numbers[DQ]),
+// OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &key_numbers[QINV]),
+// OSSL_PARAM_END
+// };
+// BIGNUM *bn = BN_new();
+// BIGNUM *bn_from = BN_new();
+//
+// if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)))
+// goto err;
+//
+// if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+// || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
+// fromdata_params), 1))
+// goto err;
+//
+// for (;;) {
+// ret = 0;
+// if (!TEST_int_eq(EVP_PKEY_get_bits(pk), 32)
+// || !TEST_int_eq(EVP_PKEY_get_security_bits(pk), 8)
+// || !TEST_int_eq(EVP_PKEY_get_size(pk), 4)
+// || !TEST_false(EVP_PKEY_missing_parameters(pk)))
+// goto err;
+//
+// EVP_PKEY_CTX_free(key_ctx);
+// if (!TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, pk, "")))
+// goto err;
+//
+// if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0)
+// || !TEST_int_gt(EVP_PKEY_public_check(key_ctx), 0)
+// || !TEST_int_gt(EVP_PKEY_private_check(key_ctx), 0)
+// || !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0))
+// goto err;
+//
+// /* EVP_PKEY_copy_parameters() should fail for RSA */
+// if (!TEST_ptr(copy_pk = EVP_PKEY_new())
+// || !TEST_false(EVP_PKEY_copy_parameters(copy_pk, pk)))
+// goto err;
+// EVP_PKEY_free(copy_pk);
+// copy_pk = NULL;
+//
+// ret = test_print_key_using_pem("RSA", pk)
+// && test_print_key_using_encoder("RSA", pk);
+//
+// if (!ret || dup_pk != NULL)
+// break;
+//
+// if (!TEST_ptr(dup_pk = EVP_PKEY_dup(pk)))
+// goto err;
+// ret = ret && TEST_int_eq(EVP_PKEY_eq(pk, dup_pk), 1);
+// EVP_PKEY_free(pk);
+// pk = dup_pk;
+// if (!ret)
+// goto err;
+// }
+// err:
+// /* for better diagnostics always compare key params */
+// for (i = 0; fromdata_params[i].key != NULL; ++i) {
+// if (!TEST_true(BN_set_word(bn_from, key_numbers[i]))
+// || !TEST_true(EVP_PKEY_get_bn_param(pk, fromdata_params[i].key, &bn))
+// || !TEST_BN_eq(bn, bn_from))
+// ret = 0;
+// }
+// BN_free(bn_from);
+// BN_free(bn);
+// EVP_PKEY_free(pk);
+// EVP_PKEY_free(copy_pk);
+// EVP_PKEY_CTX_free(key_ctx);
+// EVP_PKEY_CTX_free(ctx);
+//
+// return ret;
+//}

static int test_evp_pkey_get_bn_param_large(void)
{
Expand Down