diff --git a/Dockerfile b/Dockerfile index 1014882af..f1458cf66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/jss.spec b/jss.spec index c7f7be5f2..735e85753 100644 --- a/jss.spec +++ b/jss.spec @@ -55,8 +55,9 @@ BuildRequires: zip BuildRequires: unzip BuildRequires: gcc-c++ -BuildRequires: nss-devel >= 3.66 -BuildRequires: nss-tools >= 3.66 + +BuildRequires: nss-devel >= 3.44, nss-devel < 3.66 +BuildRequires: nss-tools >= 3.44, nss-tools < 3.66 BuildRequires: %{java_devel} BuildRequires: jpackage-utils BuildRequires: slf4j @@ -66,7 +67,7 @@ BuildRequires: apache-commons-lang3 BuildRequires: junit -Requires: nss >= 3.66 +Requires: nss >= 3.44, nss < 3.66 Requires: %{java_headless} Requires: jpackage-utils Requires: slf4j diff --git a/src/main/java/org/mozilla/jss/pkcs11/PKCS11Constants.java b/src/main/java/org/mozilla/jss/pkcs11/PKCS11Constants.java index 248c5acc1..81e0e029c 100644 --- a/src/main/java/org/mozilla/jss/pkcs11/PKCS11Constants.java +++ b/src/main/java/org/mozilla/jss/pkcs11/PKCS11Constants.java @@ -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. *