Skip to content

Commit e6e8a0f

Browse files
authored
Add matching PQC algs to auth_alg_defs[] with NSS (dogtagpki#1057)
Fix build failure caused by updated NSS version with new pqc defs int auth_alg_defs[] This requires the previous commit: 8cbe1fa This patch makes cognizant of the os version. fixes https://issues.redhat.com/browse/IDM-2428
1 parent 706e320 commit e6e8a0f

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ option(TEST_WITH_INTERNET "When enabled, runs various tests which require an int
4646
##
4747
# NSS V3.112 have some PQC defs in auth_alg_defs of ssl3con.c
4848
# that need to be reflected into JSS SSLCipher.c (auth_alg_defs[])
49-
# The upstream NSS (currently v3.113) apparently has no such defs.
49+
# Some OS platforms not yet have such defs.
5050
#
5151
option(ENABLE_NSS_VERSION_PQC_DEF "Enable PQC DEF to match NSS" OFF)
5252

jss.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Name: jss
2121
# - GA/update (supported): <none>
2222
%global phase beta2
2323

24+
%if 0%{?rhel} && 0%{?rhel} >= 10
25+
%global enable_nss_version_pqc_def_flag -DENABLE_NSS_VERSION_PQC_DEF=ON
26+
%endif
27+
2428
%undefine timestamp
2529
%undefine commit_id
2630

@@ -310,7 +314,7 @@ touch %{_vpath_builddir}/.targets/finished_generate_javadocs
310314
--lib-dir=%{_libdir} \
311315
--sysconf-dir=%{_sysconfdir} \
312316
--share-dir=%{_datadir} \
313-
--cmake=%{__cmake} \
317+
--cmake="%{__cmake} %{?enable_nss_version_pqc_def_flag}" \
314318
--java-home=%{java_home} \
315319
--jni-dir=%{_jnidir} \
316320
--version=%{version} \

0 commit comments

Comments
 (0)