Skip to content

Commit

Permalink
Downgrade NSS dependency
Browse files Browse the repository at this point in the history
The NSS dependency has been downgraded temporarily to
avoid intermittent CI failures reported in this ticket:
dogtagpki#781

Additional dependencies to NSS subpackages have been
added to avoid conflicts.

The PKCS11Constants have to be reverted as well to
match the NSS version.
  • Loading branch information
edewata committed Jul 9, 2021
1 parent 081c6de commit 775a60b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 53 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ WORKDIR /tmp/src

# Build packages
RUN dnf install -y git rpm-build
RUN dnf --showduplicates list nss
RUN dnf builddep -y --spec jss.spec
RUN ./build.sh $BUILD_OPTS --work-dir=../build rpm

Expand Down
15 changes: 12 additions & 3 deletions jss.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# > jss-VERSION-RELEASE.patch
# Patch: jss-VERSION-RELEASE.patch

################################################################################
# NSS
################################################################################

%define nss_version 3.57.0

################################################################################
# Java
################################################################################
Expand Down Expand Up @@ -55,8 +61,9 @@ BuildRequires: zip
BuildRequires: unzip

BuildRequires: gcc-c++
BuildRequires: nss-devel >= 3.66
BuildRequires: nss-tools >= 3.66
BuildRequires: nss-devel = %{nss_version}
BuildRequires: nss-util-devel = %{nss_version}
BuildRequires: nss-tools = %{nss_version}
BuildRequires: %{java_devel}
BuildRequires: jpackage-utils
BuildRequires: slf4j
Expand All @@ -66,7 +73,9 @@ BuildRequires: apache-commons-lang3

BuildRequires: junit

Requires: nss >= 3.66
Requires: nss = %{nss_version}
Requires: nss-util = %{nss_version}
Requires: nss-tools = %{nss_version}
Requires: %{java_headless}
Requires: jpackage-utils
Requires: slf4j
Expand Down
51 changes: 1 addition & 50 deletions src/main/java/org/mozilla/jss/pkcs11/PKCS11Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -5632,7 +5632,7 @@ public interface PKCS11Constants {
*
* Source file: /usr/include/nss3/pkcs11t.h
*/
public static final long CKR_PUBLIC_KEY_INVALID = 0x000001B9L;
public static final long CKR_PUBLIC_KEY_INVALID = 0x0000001BL;

/**
* Content automatically generated; see NSS documentation for more information.
Expand Down Expand Up @@ -7069,55 +7069,6 @@ public interface PKCS11Constants {
*/
public static final long CKM_TLS_PRF_GENERAL = 0x80000373L;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKS_NSS_UNINITIALIZED = 0xFFFFFFFFL;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKS_NSS_FIPS_NOT_OK = 0x00000000L;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKS_NSS_FIPS_OK = 0x00000001L;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKT_NSS_SESSION_CHECK = 0x00000001L;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKT_NSS_OBJECT_CHECK = 0x00000002L;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKT_NSS_BOTH_CHECK = 0x00000003L;

/**
* Content automatically generated; see NSS documentation for more information.
*
* Source file: /usr/include/nss3/pkcs11n.h
*/
public static final long CKT_NSS_SESSION_LAST_CHECK = 0x00000004L;

/**
* Content automatically generated; see NSS documentation for more information.
*
Expand Down

0 comments on commit 775a60b

Please sign in to comment.