diff --git a/README.md b/README.md index 5e3036db6..2e63576cf 100644 --- a/README.md +++ b/README.md @@ -160,17 +160,20 @@ disable the default fB--depth=1 shallow cloning of git repo(s). -f, --freetype-dir specify the location of an existing FreeType library. -This is typically used in conjunction with -F. +Do not use with -F, as it would invalidate this switch. +DEPRECATED: Only makes sense for JDKs without a bundled freetype --freetype-build-param specify any special freetype build parameters (required for some Operating Systems). +DEPRECATED: Only makes sense for JDKs without a bundled freetype --freetype-version specify the version of freetype you are building. +DEPRECATED: Only makes sense for JDKs without a bundled freetype -F, --skip-freetype -skip building Freetype automatically. -This is typically used in conjunction with -f. +set JDK to link against system freetype, +instead of building bundled version -h, --help print the man page. diff --git a/build-farm/platform-specific-configurations/aix.sh b/build-farm/platform-specific-configurations/aix.sh index 78ff55677..685d8d0ec 100755 --- a/build-farm/platform-specific-configurations/aix.sh +++ b/build-farm/platform-specific-configurations/aix.sh @@ -57,13 +57,6 @@ then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-extra-ldflags=-lpthread --with-extra-cflags=-lpthread --with-extra-cxxflags=-lpthread" fi -if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then - # jdk-21+ uses "bundled" FreeType - export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled" -else - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" -fi - if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then export LDR_CNTRL=MAXDATA=0x80000000 fi diff --git a/build-farm/platform-specific-configurations/alpine-linux.sh b/build-farm/platform-specific-configurations/alpine-linux.sh index 07775006b..b3db53f48 100644 --- a/build-farm/platform-specific-configurations/alpine-linux.sh +++ b/build-farm/platform-specific-configurations/alpine-linux.sh @@ -26,14 +26,6 @@ fi # ccache seems flaky on alpine export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" -if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then - # jdk-21+ uses "bundled" FreeType - export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled" -else - # We don't bundle freetype on alpine anymore, and expect the user to have it. - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" -fi - ## This affects Alpine docker images and also evaluation pipelines if [ "$(pwd | wc -c)" -gt 83 ]; then # Use /tmp for alpine in preference to $HOME as Alpine fails gpg operation if PWD > 83 characters diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index e51e3bc3b..7ea348e37 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -18,14 +18,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "$SCRIPT_DIR/../../sbin/common/constants.sh" source "$SCRIPT_DIR/../../sbin/common/downloaders.sh" -if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then - # jdk-21+ uses "bundled" FreeType - export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled" -else - # Bundling our own freetype can cause problems, so we skip that on linux. - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" -fi - ## This affects Alpine docker images and also evaluation pipelines if [ "$(pwd | wc -c)" -gt 83 ]; then # Use /tmp for alpine in preference to $HOME as Alpine fails gpg operation if PWD > 83 characters diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh index a4f072bcd..62b06fff0 100755 --- a/build-farm/platform-specific-configurations/mac.sh +++ b/build-farm/platform-specific-configurations/mac.sh @@ -45,7 +45,6 @@ then fi if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling" - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" fi else if [[ "$JAVA_FEATURE_VERSION" -ge 11 ]]; then @@ -76,10 +75,6 @@ else fi fi -if [[ "$JAVA_FEATURE_VERSION" -ge 21 ]]; then - # jdk-21+ uses "bundled" FreeType - export BUILD_ARGS="${BUILD_ARGS} --freetype-dir bundled" -fi # The configure option '--with-macosx-codesign-identity' is supported in JDK8 OpenJ9 and JDK11 and JDK14+ if [[ ( "$JAVA_FEATURE_VERSION" -eq 11 ) || ( "$JAVA_FEATURE_VERSION" -ge 14 ) ]] diff --git a/build-farm/platform-specific-configurations/solaris.sh b/build-farm/platform-specific-configurations/solaris.sh index df17b4829..6c3f41afe 100644 --- a/build-farm/platform-specific-configurations/solaris.sh +++ b/build-farm/platform-specific-configurations/solaris.sh @@ -17,7 +17,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # shellcheck source=sbin/common/constants.sh source "$SCRIPT_DIR/../../sbin/common/constants.sh" -export BUILD_ARGS="${BUILD_ARGS} --skip-freetype --make-args SHELL=/bin/bash" +export BUILD_ARGS="${BUILD_ARGS} --make-args SHELL=/bin/bash" if [ "${ARCHITECTURE}" == "x64" ]; then export CUPS="--with-cups=/opt/sfw/cups" diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh index 0066afd15..a4498a41c 100755 --- a/build-farm/platform-specific-configurations/windows.sh +++ b/build-farm/platform-specific-configurations/windows.sh @@ -68,7 +68,6 @@ then export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-openssl=fetched --enable-openssl-bundling" if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" # https://github.com/adoptium/temurin-build/issues/243 export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE" export PATH="/c/cygwin64/bin:/usr/bin:$PATH" @@ -85,7 +84,6 @@ then else if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH" elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ] then @@ -112,19 +110,6 @@ then then export INCLUDE="C:\Program Files\Debugging Tools for Windows (x64)\sdk\inc;$INCLUDE" export PATH="$PATH:/c/cygwin64/bin" - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" - elif [ "${JAVA_TO_BUILD}" == "${JDK9_VERSION}" ] - then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" - elif [ "${JAVA_TO_BUILD}" == "${JDK10_VERSION}" ] - then - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" - elif [ "$JAVA_FEATURE_VERSION" -lt 19 ] - then - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" - elif [ "$JAVA_FEATURE_VERSION" -ge 19 ] - then - export BUILD_ARGS="${BUILD_ARGS} --skip-freetype" fi CUDA_VERSION=9.1 diff --git a/cyclonedx-lib/build.xml b/cyclonedx-lib/build.xml index 8d6142da7..c4f989a0d 100644 --- a/cyclonedx-lib/build.xml +++ b/cyclonedx-lib/build.xml @@ -380,7 +380,7 @@ - + @@ -768,7 +768,7 @@ - + diff --git a/makejdk-any-platform.1 b/makejdk-any-platform.1 index c4436215a..4d069e446 100755 --- a/makejdk-any-platform.1 +++ b/makejdk-any-platform.1 @@ -115,17 +115,20 @@ disable the default \fB--depth=1\fR shallow cloning of git repo(s). .TP .BR \-f ", " \-\-freetype-dir " " \fI\fR specify the location of an existing FreeType library. -This is typically used in conjunction with \fB<-F>\fR. +Do not use with \fB<-F>\fR, as it would invalidate this switch. +DEPRECATED: Only makes sense for JDKs without a bundled freetype .TP .BR \-\-freetype-build-param " " \fI\fR specify any special freetype build parameters (required for some OS's). +DEPRECATED: Only makes sense for JDKs without a bundled freetype .TP .BR \-\-freetype-version " " \fI\fR specify the version of freetype you are building. +DEPRECATED: Only makes sense for JDKs without a bundled freetype .TP .BR \-F ", " \-\-skip-freetype -skip building Freetype automatically. -This is typically used in conjunction with \fB<-f>\fR. +set JDK to link against system freetype, +instead of building the bundled version .TP .BR \-h ", " \-\-help print this help. diff --git a/sbin/build.sh b/sbin/build.sh index 3d658d5a5..6f027481e 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -105,7 +105,7 @@ configureDevKitConfigureParameter() { addConfigureArg "--with-devkit=" "${BUILD_CONFIG[ADOPTIUM_DEVKIT_LOCATION]}" fi fi -} +} # Configure the boot JDK configureBootJDKConfigureParameter() { @@ -253,6 +253,98 @@ patchFreetypeWindows() { fi } +# Returns the version numbers in version-numbers.conf as a space-seperated list of integers. +# e.g. 17 0 1 5 +# or 8 0 0 432 +# Build number will not be included, as that is not stored in this file. +versionNumbersFileParser() { + funcName="versionNumbersFileParser" + buildSrc="${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" + jdkVersion="${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" + + # Find version-numbers.conf (or equivalent) and confirm we can read it. + numbersFile="${buildSrc}/common/autoconf/version-numbers" + [ "$jdkVersion" -eq 11 ] && numbersFile="${buildSrc}/make/autoconf/version-numbers" + [ "$jdkVersion" -ge 17 ] && numbersFile="${buildSrc}/make/conf/version-numbers.conf" + [ ! -r "${numbersFile}" ] && echo "ERROR: build.sh: ${funcName}: JDK version file not found: ${numbersFile}" >&2 && exit 1 + + fileVersionString="" + error="" + if [ "$jdkVersion" -eq 8 ]; then + # jdk8 uses this format: jdk8u482-b01 + fileVersionString="jdk8u$(grep "JDK_UPDATE_VERSION" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true" + [[ ! "${fileVersionString}" =~ ^jdk8u[0-9]+$ || $error ]] && echo "ERROR: build.sh: ${funcName}: version file could not be parsed." >&2 && exit 1 + else + # File parsing logic for jdk11+. + patchNo="$(grep "DEFAULT_VERSION_PATCH" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true" + updateNo="$(grep "DEFAULT_VERSION_UPDATE" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true" + interimNo="$(grep "DEFAULT_VERSION_INTERIM" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true" + featureNo="$(grep "DEFAULT_VERSION_FEATURE" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true" + + [[ ! "${patchNo}" =~ ^0$ ]] && fileVersionString=".${patchNo}" + [[ ! "${updateNo}.${fileVersionString}" =~ ^[0\.]+$ ]] && fileVersionString=".${updateNo}${fileVersionString}" + [[ ! "${interimNo}.${fileVersionString}" =~ ^[0\.]+$ ]] && fileVersionString=".${interimNo}${fileVersionString}" + fileVersionString="jdk-${featureNo}${fileVersionString}" + + [[ ! "${fileVersionString}" =~ ^jdk\-[0-9]+[0-9\.]*$ || $error ]] && echo "ERROR: build.sh: ${funcName}: version file could not be parsed." >&2 && exit 1 + fi + + # Returning the formatted jdk version string. + echo "${fileVersionString}" +} + +# This function attempts to compare the jdk version from version-numbers.conf with arg 1. +# We will then return whichever version is bigger/later. +# e.g. 17.0.1+32 > 17.0.0+64 +# If any errors or unusual circumstances are detected, we simply return arg1 to avoid destabilising the build. +# Note: For error messages, use 'echo message >&2' to ensure the error isn't intercepted by the subshell. +compareToOpenJDKFileVersion() { + funcName="compareToOpenJDKFileVersion" + # First, sanity checking on the arg. + if [ $# -eq 0 ]; then + echo "compareToOpenJDKFileVersion_was_called_with_no_args" + exit 1 + elif [ $# -gt 1 ]; then + echo "ERROR: build.sh: ${funcName}: Too many arguments (>1) were passed to this function." >&2 + echo "$1" + exit 1 + fi + + # Check if arg 1 looks like a jdk version string. + # Example: JDK11+: jdk-21.0.10+2 + # Example: JDK8 : jdk8u482-b01 + if [[ ! "$1" =~ ^jdk\-[0-9]+[0-9\.]*(\+[0-9]+)?$ ]]; then + if [[ ! "$1" =~ ^jdk8u[0-9]+(\-b[0-9][0-9]+)?$ ]]; then + echo "ERROR: build.sh: ${funcName}: The JDK version passed to this function did not match the expected format." >&2 + echo "$1" + exit 1 + fi + fi + + # Retrieve the jdk version from version-numbers.conf (minus the build number). + if ! fileVersionString="$(versionNumbersFileParser)"; then + # This is to catch versionNumbersFileParser failures. + echo "ERROR: build.sh: ${funcName}: versionNumbersFileParser has failed." >&2 + echo "$1" + exit 1 + fi + + if [[ "$1" =~ ^${fileVersionString}.*$ ]]; then + # The file version matches the function argument. + echo "$1" + return + fi + + # The file version does not match the function argument. + # Returning the file version. + [ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -eq 8 ] && fileVersionString+="-b00" + [ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -gt 8 ] && fileVersionString+="+0" + + echo "WARNING: build.sh: ${funcName}: JDK version in source does not match the supplied version (likely the latest git tag)." >&2 + echo "WARNING: The JDK version in source will be used instead." >&2 + echo "${fileVersionString}" +} + getOpenJdkVersion() { local version @@ -548,22 +640,34 @@ configureAlsaLocation() { fi } +setBundledFreeType() { + echo "Freetype set from bundled in jdk" + freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-bundled} +} + +setFreeTypeFromExternalSrcs() { + echo "Freetype set from local sources" + addConfigureArg "--with-freetype-src=" "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype" +} + +setFreeTypeFromInstalled() { + echo "Freetype set from installed binary" + freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-"${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/installedfreetype"} +} + configureFreetypeLocation() { if [[ ! "${CONFIGURE_ARGS}" =~ "--with-freetype" ]]; then if [[ "${BUILD_CONFIG[FREETYPE]}" == "true" ]]; then local freetypeDir="${BUILD_CONFIG[FREETYPE_DIRECTORY]}" - if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then - case "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" in - jdk8* | jdk9* | jdk10*) addConfigureArg "--with-freetype-src=" "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype" ;; - *) freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-bundled} ;; - esac + if isFreeTypeInSources ; then + setBundledFreeType else - case "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" in - jdk8* | jdk9* | jdk10*) freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-"${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/installedfreetype"} ;; - *) freetypeDir=${BUILD_CONFIG[FREETYPE_DIRECTORY]:-bundled} ;; - esac + if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then + setFreeTypeFromExternalSrcs + else + setFreeTypeFromInstalled + fi fi - if [[ -n "$freetypeDir" ]]; then echo "setting freetype dir to ${freetypeDir}" addConfigureArg "--with-freetype=" "${freetypeDir}" @@ -2074,7 +2178,14 @@ getOpenJDKTag() { echo "${BUILD_CONFIG[BRANCH]}" else echo " getOpenJDKTag(): Determining tag from checked out repository.." 1>&2 - getFirstTagFromOpenJDKGitRepo + tagString=$(getFirstTagFromOpenJDKGitRepo) + # Now we check if the version in the code is later than the version we have so far. + # This prevents an issue where the git repo tags do not match the version string in the source. + # Without this code, we can create builds where half of the version strings do not match. + # This results in nonsensical -version output, incorrect folder names, and lots of failures + # relating to those two factors. + tagString=$(compareToOpenJDKFileVersion "$tagString") + echo "${tagString}" fi } diff --git a/sbin/prepareWorkspace.sh b/sbin/prepareWorkspace.sh index 0ec31be03..728499eaa 100644 --- a/sbin/prepareWorkspace.sh +++ b/sbin/prepareWorkspace.sh @@ -40,6 +40,48 @@ FREETYPE_FONT_SHARED_OBJECT_FILENAME="libfreetype.so*" # sha256 of https://github.com/adoptium/devkit-binaries/releases/tag/vs2022_redist_14.40.33807_10.0.26100.1742 WINDOWS_REDIST_CHECKSUM="ac6060f5f8a952f59faef20e53d124c2c267264109f3f6fabeb2b7aefb3e3c62" + +checkBundledFreetypeJdkConfig() { + if [ "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" = "bundled" ] ; then + if [ "${BUILD_CONFIG[FREETYPE]}" = "false" ] ; then + echo "--freetype-dir 'bundled' is in contradiction with -skip-freetype" + exit 1 + fi + echo "--freetype-dir is set to 'bundled' which is unusual, but accepted. It should be default." + elif [ "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" = "system" ] ; then + echo "--freetype-dir is set to 'system' which is unusual, but accepted. Use --skip-freetype instead." + elif [ -n "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" ] ; then + echo "--freetype-dir is not accepted for JDK with bundled freetype." + exit 1 + fi +} + +checkNoBundledFreetypeJdkConfig() { + if [ "${BUILD_CONFIG[FREETYPE]}" = "false" ] && [ -n "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" ] ; then + echo "--freetype-dir is declared together with --skip-freetype, that is invalid, as JDK would build against system freetype anyway." + exit 1 + fi +} + +isFreeTypeInSources() { + local libfreetypeid="libfreetype/src" + local location="${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" + if [ ! -e "$location" ] ; then + echo "No jdk sources exists to to determine $libfreetypeid presence" + exit 1 + fi + local found=0 + find "$location" | grep -q "$libfreetypeid" || found=$? + if [ $found -eq 0 ] ; then + echo "$libfreetypeid found in $location" + checkBundledFreetypeJdkConfig + else + echo "$libfreetypeid not found in $location" + checkNoBundledFreetypeJdkConfig + fi + return $found +} + copyFromDir() { echo "Copying OpenJDK source from ${BUILD_CONFIG[OPENJDK_LOCAL_SOURCE_ARCHIVE_ABSPATH]} to $(pwd)/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]} to be built" # We really do not want to use .git for dirs, as we expect user have them set up, ignoring them @@ -824,6 +866,8 @@ downloadBootJdkIfNeeded () { # Download all of the dependencies for OpenJDK (Alsa, FreeType, boot-jdk etc.) downloadingRequiredDependencies() { + local freeTypeInSources=0 + isFreeTypeInSources || freeTypeInSources="$?" if [[ "${BUILD_CONFIG[CLEAN_LIBS]}" == "true" ]]; then rm -rf "${BUILD_CONFIG[WORKSPACE_DIR]}/libs/freetype" || true rm -rf "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/installedalsa" || true @@ -850,19 +894,18 @@ downloadingRequiredDependencies() { fi if [[ "${BUILD_CONFIG[FREETYPE]}" == "true" ]]; then - case "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" in - jdk8* | jdk9* | jdk10*) - if [ -z "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" ]; then - echo "Checking and download FreeType Font dependency" - checkingAndDownloadingFreeType - else - echo "" - echo "---> Skipping the process of checking and downloading the FreeType Font dependency, a pre-built version provided at ${BUILD_CONFIG[FREETYPE_DIRECTORY]} <---" - echo "" - fi - ;; - *) echo "Using bundled Freetype" ;; - esac + if [ "0${freeTypeInSources}" -ne 0 ] ; then + if [ -z "${BUILD_CONFIG[FREETYPE_DIRECTORY]}" ]; then + echo "Checking and downloading FreeType Font dependency" + checkingAndDownloadingFreeType + else + echo "" + echo "---> Skipping the process of checking and downloading the FreeType Font dependency, a pre-built version is provided at ${BUILD_CONFIG[FREETYPE_DIRECTORY]} <---" + echo "" + fi + else + echo "Using bundled Freetype" + fi else echo "Skipping Freetype" fi @@ -947,10 +990,10 @@ createSourceTagFile(){ function configureWorkspace() { if [[ "${BUILD_CONFIG[ASSEMBLE_EXPLODED_IMAGE]}" != "true" ]]; then createWorkspace + checkoutAndCloneOpenJDKGitRepo downloadingRequiredDependencies downloadDevkit relocateToTmpIfNeeded - checkoutAndCloneOpenJDKGitRepo applyPatches if [ "${BUILD_CONFIG[CUSTOM_CACERTS]}" = "true" ] ; then prepareMozillaCacerts diff --git a/sbin/solaris/build-simple.sh b/sbin/solaris/build-simple.sh index 8f1780e8b..65f010d9d 100644 --- a/sbin/solaris/build-simple.sh +++ b/sbin/solaris/build-simple.sh @@ -155,13 +155,24 @@ scp -prP "${SSH_PORT}" $SSH_OPTS "${SSH_TARGET}:temurin-build/build-farm/workspa cd workspace/target || exit 1 for FILE in OpenJDK*; do echo Creating metadata for ${FILE} - sha256sum $FILE > $FILE.sha256.txt - sha256=$(cat $FILE.sha256.txt | cut -d' ' -f1) - if [[ "$FILE" =~ .*sbom.*\.json ]]; then - metadata_file=${FILE%.*}-metadata.json + + # Generate checksum for all files, but do not leave sbom.sha256.txt behind + sha_file="${FILE}.sha256.txt" + sha256sum "${FILE}" > "${sha_file}" + sha256=$(cut -d' ' -f1 "${sha_file}") + + # If SBOM, remove checksum file after capturing hash + if [[ "$FILE" =~ .*sbom.*\.json ]]; then + rm -f "${sha_file}" + fi + + # Metadata filename: SBOM files get -metadata.json + if [[ "$FILE" =~ .*sbom.*\.json ]]; then + metadata_file="${FILE%.*}-metadata.json" else - metadata_file=$FILE.json + metadata_file="${FILE}.json" fi + createMetadataFile "$metadata_file" "${TARGET_ARCH}" "$SCM_REF" metadata/buildSource.txt metadata/version.txt "$sha256" done # Simple test job uses filenames.txt to determine the correct filenames to pull down diff --git a/security/certdata.txt b/security/certdata.txt index 1b9af7cd9..be24d9501 100644 --- a/security/certdata.txt +++ b/security/certdata.txt @@ -23196,557 +23196,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "CommScope Public Trust ECC Root-01" -# -# Issuer: CN=CommScope Public Trust ECC Root-01,O=CommScope,C=US -# Serial Number:43:70:82:77:cf:4d:5d:34:f1:ca:ae:32:2f:37:f7:f4:7f:75:a0:9e -# Subject: CN=CommScope Public Trust ECC Root-01,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 17:35:43 2021 -# Not Valid After : Sat Apr 28 17:35:42 2046 -# Fingerprint (SHA-256): 11:43:7C:DA:7B:B4:5E:41:36:5F:45:B3:9A:38:98:6B:0D:E0:0D:EF:34:8E:0C:7B:B0:87:36:33:80:0B:C3:8B -# Fingerprint (SHA1): 07:86:C0:D8:DD:8E:C0:80:98:06:98:D0:58:7A:EF:DE:A6:CC:A2:5D -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust ECC Root-01" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\105\103\103\040\122\157\157\164\055\060\061 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\105\103\103\040\122\157\157\164\055\060\061 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\103\160\202\167\317\115\135\064\361\312\256\062\057\067 -\367\364\177\165\240\236 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\002\035\060\202\001\243\240\003\002\001\002\002\024\103 -\160\202\167\317\115\135\064\361\312\256\062\057\067\367\364\177 -\165\240\236\060\012\006\010\052\206\110\316\075\004\003\003\060 -\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061\022 -\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143\157 -\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157\155 -\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124\162 -\165\163\164\040\105\103\103\040\122\157\157\164\055\060\061\060 -\036\027\015\062\061\060\064\062\070\061\067\063\065\064\063\132 -\027\015\064\066\060\064\062\070\061\067\063\065\064\062\132\060 -\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061\022 -\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143\157 -\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157\155 -\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124\162 -\165\163\164\040\105\103\103\040\122\157\157\164\055\060\061\060 -\166\060\020\006\007\052\206\110\316\075\002\001\006\005\053\201 -\004\000\042\003\142\000\004\113\066\351\256\127\136\250\160\327 -\320\217\164\142\167\303\136\172\252\345\266\242\361\170\375\002 -\176\127\335\221\171\234\154\271\122\210\124\274\057\004\276\270 -\315\366\020\321\051\354\265\320\240\303\360\211\160\031\273\121 -\145\305\103\234\303\233\143\235\040\203\076\006\013\246\102\104 -\205\021\247\112\072\055\351\326\150\057\110\116\123\053\007\077 -\115\275\271\254\167\071\127\243\102\060\100\060\017\006\003\125 -\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003 -\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003 -\125\035\016\004\026\004\024\216\007\142\300\120\335\306\031\006 -\000\106\164\004\367\363\256\175\165\115\060\060\012\006\010\052 -\206\110\316\075\004\003\003\003\150\000\060\145\002\061\000\234 -\063\337\101\343\043\250\102\066\046\227\065\134\173\353\333\113 -\370\252\213\163\125\025\134\254\170\051\017\272\041\330\304\240 -\330\321\003\335\155\321\071\075\304\223\140\322\343\162\262\002 -\060\174\305\176\210\323\120\365\036\045\350\372\116\165\346\130 -\226\244\065\137\033\145\352\141\232\160\043\265\015\243\233\222 -\122\157\151\240\214\215\112\320\356\213\016\313\107\216\320\215 -\021 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "CommScope Public Trust ECC Root-01" -# Issuer: CN=CommScope Public Trust ECC Root-01,O=CommScope,C=US -# Serial Number:43:70:82:77:cf:4d:5d:34:f1:ca:ae:32:2f:37:f7:f4:7f:75:a0:9e -# Subject: CN=CommScope Public Trust ECC Root-01,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 17:35:43 2021 -# Not Valid After : Sat Apr 28 17:35:42 2046 -# Fingerprint (SHA-256): 11:43:7C:DA:7B:B4:5E:41:36:5F:45:B3:9A:38:98:6B:0D:E0:0D:EF:34:8E:0C:7B:B0:87:36:33:80:0B:C3:8B -# Fingerprint (SHA1): 07:86:C0:D8:DD:8E:C0:80:98:06:98:D0:58:7A:EF:DE:A6:CC:A2:5D -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust ECC Root-01" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\007\206\300\330\335\216\300\200\230\006\230\320\130\172\357\336 -\246\314\242\135 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\072\100\247\374\003\214\234\070\171\057\072\242\154\266\012\026 -END -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\105\103\103\040\122\157\157\164\055\060\061 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\103\160\202\167\317\115\135\064\361\312\256\062\057\067 -\367\364\177\165\240\236 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "CommScope Public Trust ECC Root-02" -# -# Issuer: CN=CommScope Public Trust ECC Root-02,O=CommScope,C=US -# Serial Number:28:fd:99:60:41:47:a6:01:3a:ca:14:7b:1f:ef:f9:68:08:83:5d:7d -# Subject: CN=CommScope Public Trust ECC Root-02,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 17:44:54 2021 -# Not Valid After : Sat Apr 28 17:44:53 2046 -# Fingerprint (SHA-256): 2F:FB:7F:81:3B:BB:B3:C8:9A:B4:E8:16:2D:0F:16:D7:15:09:A8:30:CC:9D:73:C2:62:E5:14:08:75:D1:AD:4A -# Fingerprint (SHA1): 3C:3F:EF:57:0F:FE:65:93:86:9E:A0:FE:B0:F6:ED:8E:D1:13:C7:E5 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust ECC Root-02" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\105\103\103\040\122\157\157\164\055\060\062 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\105\103\103\040\122\157\157\164\055\060\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\050\375\231\140\101\107\246\001\072\312\024\173\037\357 -\371\150\010\203\135\175 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\002\034\060\202\001\243\240\003\002\001\002\002\024\050 -\375\231\140\101\107\246\001\072\312\024\173\037\357\371\150\010 -\203\135\175\060\012\006\010\052\206\110\316\075\004\003\003\060 -\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061\022 -\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143\157 -\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157\155 -\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124\162 -\165\163\164\040\105\103\103\040\122\157\157\164\055\060\062\060 -\036\027\015\062\061\060\064\062\070\061\067\064\064\065\064\132 -\027\015\064\066\060\064\062\070\061\067\064\064\065\063\132\060 -\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061\022 -\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143\157 -\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157\155 -\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124\162 -\165\163\164\040\105\103\103\040\122\157\157\164\055\060\062\060 -\166\060\020\006\007\052\206\110\316\075\002\001\006\005\053\201 -\004\000\042\003\142\000\004\170\060\201\350\143\036\345\353\161 -\121\017\367\007\007\312\071\231\174\116\325\017\314\060\060\013 -\217\146\223\076\317\275\305\206\275\371\261\267\264\076\264\007 -\310\363\226\061\363\355\244\117\370\243\116\215\051\025\130\270 -\325\157\177\356\154\042\265\260\257\110\105\012\275\250\111\224 -\277\204\103\260\333\204\112\003\043\031\147\152\157\301\156\274 -\006\071\067\321\210\042\367\243\102\060\100\060\017\006\003\125 -\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003 -\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003 -\125\035\016\004\026\004\024\346\030\165\377\357\140\336\204\244 -\365\106\307\336\112\125\343\062\066\171\365\060\012\006\010\052 -\206\110\316\075\004\003\003\003\147\000\060\144\002\060\046\163 -\111\172\266\253\346\111\364\175\122\077\324\101\004\256\200\103 -\203\145\165\271\205\200\070\073\326\157\344\223\206\253\217\347 -\211\310\177\233\176\153\012\022\125\141\252\021\340\171\002\060 -\167\350\061\161\254\074\161\003\326\204\046\036\024\270\363\073 -\073\336\355\131\374\153\114\060\177\131\316\105\351\163\140\025 -\232\114\360\346\136\045\042\025\155\302\207\131\320\262\216\152 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "CommScope Public Trust ECC Root-02" -# Issuer: CN=CommScope Public Trust ECC Root-02,O=CommScope,C=US -# Serial Number:28:fd:99:60:41:47:a6:01:3a:ca:14:7b:1f:ef:f9:68:08:83:5d:7d -# Subject: CN=CommScope Public Trust ECC Root-02,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 17:44:54 2021 -# Not Valid After : Sat Apr 28 17:44:53 2046 -# Fingerprint (SHA-256): 2F:FB:7F:81:3B:BB:B3:C8:9A:B4:E8:16:2D:0F:16:D7:15:09:A8:30:CC:9D:73:C2:62:E5:14:08:75:D1:AD:4A -# Fingerprint (SHA1): 3C:3F:EF:57:0F:FE:65:93:86:9E:A0:FE:B0:F6:ED:8E:D1:13:C7:E5 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust ECC Root-02" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\074\077\357\127\017\376\145\223\206\236\240\376\260\366\355\216 -\321\023\307\345 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\131\260\104\325\145\115\270\134\125\031\222\002\266\321\224\262 -END -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\105\103\103\040\122\157\157\164\055\060\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\050\375\231\140\101\107\246\001\072\312\024\173\037\357 -\371\150\010\203\135\175 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "CommScope Public Trust RSA Root-01" -# -# Issuer: CN=CommScope Public Trust RSA Root-01,O=CommScope,C=US -# Serial Number:3e:03:49:81:75:16:74:31:8e:4c:ab:d5:c5:90:29:96:c5:39:10:dd -# Subject: CN=CommScope Public Trust RSA Root-01,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 16:45:54 2021 -# Not Valid After : Sat Apr 28 16:45:53 2046 -# Fingerprint (SHA-256): 02:BD:F9:6E:2A:45:DD:9B:F1:8F:C7:E1:DB:DF:21:A0:37:9B:A3:C9:C2:61:03:44:CF:D8:D6:06:FE:C1:ED:81 -# Fingerprint (SHA1): 6D:0A:5F:F7:B4:23:06:B4:85:B3:B7:97:64:FC:AC:75:F5:33:F2:93 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust RSA Root-01" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\122\123\101\040\122\157\157\164\055\060\061 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\122\123\101\040\122\157\157\164\055\060\061 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\076\003\111\201\165\026\164\061\216\114\253\325\305\220 -\051\226\305\071\020\335 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\154\060\202\003\124\240\003\002\001\002\002\024\076 -\003\111\201\165\026\164\061\216\114\253\325\305\220\051\226\305 -\071\020\335\060\015\006\011\052\206\110\206\367\015\001\001\013 -\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125 -\123\061\022\060\020\006\003\125\004\012\014\011\103\157\155\155 -\123\143\157\160\145\061\053\060\051\006\003\125\004\003\014\042 -\103\157\155\155\123\143\157\160\145\040\120\165\142\154\151\143 -\040\124\162\165\163\164\040\122\123\101\040\122\157\157\164\055 -\060\061\060\036\027\015\062\061\060\064\062\070\061\066\064\065 -\065\064\132\027\015\064\066\060\064\062\070\061\066\064\065\065 -\063\132\060\116\061\013\060\011\006\003\125\004\006\023\002\125 -\123\061\022\060\020\006\003\125\004\012\014\011\103\157\155\155 -\123\143\157\160\145\061\053\060\051\006\003\125\004\003\014\042 -\103\157\155\155\123\143\157\160\145\040\120\165\142\154\151\143 -\040\124\162\165\163\164\040\122\123\101\040\122\157\157\164\055 -\060\061\060\202\002\042\060\015\006\011\052\206\110\206\367\015 -\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 -\002\001\000\260\110\145\243\015\035\102\343\221\155\235\204\244 -\141\226\022\302\355\303\332\043\064\031\166\366\352\375\125\132 -\366\125\001\123\017\362\314\214\227\117\271\120\313\263\001\104 -\126\226\375\233\050\354\173\164\013\347\102\153\125\316\311\141 -\262\350\255\100\074\272\271\101\012\005\117\033\046\205\217\103 -\265\100\265\205\321\324\161\334\203\101\363\366\105\307\200\242 -\204\120\227\106\316\240\014\304\140\126\004\035\007\133\106\245 -\016\262\113\244\016\245\174\356\370\324\142\003\271\223\152\212 -\024\270\160\370\056\202\106\070\043\016\164\307\153\101\267\320 -\051\243\235\200\260\176\167\223\143\102\373\064\203\073\163\243 -\132\041\066\353\107\372\030\027\331\272\146\302\223\244\217\374 -\135\244\255\374\120\152\225\254\274\044\063\321\275\210\177\206 -\365\365\262\163\052\217\174\257\010\362\032\230\077\251\201\145 -\077\301\214\211\305\226\060\232\012\317\364\324\310\064\355\235 -\057\274\215\070\206\123\356\227\237\251\262\143\224\027\215\017 -\334\146\052\174\122\121\165\313\231\216\350\075\134\277\236\073 -\050\215\203\002\017\251\237\162\342\054\053\263\334\146\227\000 -\100\320\244\124\216\233\135\173\105\066\046\326\162\103\353\317 -\300\352\015\334\316\022\346\175\070\237\005\047\250\227\076\351 -\121\306\154\005\050\301\002\017\351\030\155\354\275\234\006\324 -\247\111\364\124\005\153\154\060\361\353\003\325\352\075\152\166 -\302\313\032\050\111\115\177\144\340\372\053\332\163\203\201\377 -\221\003\275\224\273\344\270\216\234\062\143\315\237\273\150\201 -\261\204\133\257\066\277\167\356\035\177\367\111\233\122\354\322 -\167\132\175\221\235\115\302\071\055\344\272\202\370\157\362\116 -\036\017\116\346\077\131\245\043\334\075\207\250\050\130\050\321 -\361\033\066\333\117\304\377\341\214\133\162\214\307\046\003\047 -\243\071\012\001\252\300\262\061\140\203\042\241\117\022\011\001 -\021\257\064\324\317\327\256\142\323\005\007\264\061\165\340\015 -\155\127\117\151\207\371\127\251\272\025\366\310\122\155\241\313 -\234\037\345\374\170\250\065\232\237\101\024\316\245\264\316\224 -\010\034\011\255\126\345\332\266\111\232\112\352\143\030\123\234 -\054\056\303\002\003\001\000\001\243\102\060\100\060\017\006\003 -\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 -\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 -\003\125\035\016\004\026\004\024\067\135\246\232\164\062\302\302 -\371\307\246\025\020\131\270\344\375\345\270\155\060\015\006\011 -\052\206\110\206\367\015\001\001\013\005\000\003\202\002\001\000 -\257\247\317\336\377\340\275\102\215\115\345\042\226\337\150\352 -\175\115\052\175\320\255\075\026\134\103\347\175\300\206\350\172 -\065\143\361\314\201\310\306\013\350\056\122\065\244\246\111\220 -\143\121\254\064\254\005\073\127\000\351\323\142\323\331\051\325 -\124\276\034\020\221\234\262\155\376\131\375\171\367\352\126\320 -\236\150\124\102\217\046\122\342\114\337\057\227\246\057\322\007 -\230\250\363\140\135\113\232\130\127\210\357\202\345\372\257\154 -\201\113\222\217\100\232\223\106\131\313\137\170\026\261\147\076 -\102\013\337\050\331\260\255\230\040\276\103\174\321\136\032\011 -\027\044\215\173\135\225\351\253\301\140\253\133\030\144\200\373 -\255\340\006\175\035\312\131\270\363\170\051\147\306\126\035\257 -\266\265\164\052\166\241\077\373\165\060\237\224\136\073\245\140 -\363\313\134\014\342\016\311\140\370\311\037\026\212\046\335\347 -\047\177\353\045\246\212\275\270\055\066\020\232\261\130\115\232 -\150\117\140\124\345\366\106\023\216\210\254\274\041\102\022\255 -\306\112\211\175\233\301\330\055\351\226\003\364\242\164\014\274 -\000\035\277\326\067\045\147\264\162\213\257\205\275\352\052\003 -\217\314\373\074\104\044\202\342\001\245\013\131\266\064\215\062 -\013\022\015\353\047\302\375\101\327\100\074\162\106\051\300\214 -\352\272\017\361\006\223\056\367\234\250\364\140\076\243\361\070 -\136\216\023\301\263\072\227\207\077\222\312\170\251\034\257\320 -\260\033\046\036\276\160\354\172\365\063\230\352\134\377\053\013 -\004\116\103\335\143\176\016\247\116\170\003\225\076\324\055\060 -\225\021\020\050\056\277\240\002\076\377\136\131\323\005\016\225 -\137\123\105\357\153\207\325\110\315\026\246\226\203\341\337\263 -\006\363\301\024\333\247\354\034\213\135\220\220\015\162\121\347 -\141\371\024\312\257\203\217\277\257\261\012\131\135\334\134\327 -\344\226\255\133\140\035\332\256\227\262\071\331\006\365\166\000 -\023\370\150\114\041\260\065\304\334\125\262\311\301\101\132\034 -\211\300\214\157\164\240\153\063\115\265\001\050\375\255\255\211 -\027\073\246\232\204\274\353\214\352\304\161\044\250\272\051\371 -\010\262\047\126\065\062\137\352\071\373\061\232\325\031\314\360 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "CommScope Public Trust RSA Root-01" -# Issuer: CN=CommScope Public Trust RSA Root-01,O=CommScope,C=US -# Serial Number:3e:03:49:81:75:16:74:31:8e:4c:ab:d5:c5:90:29:96:c5:39:10:dd -# Subject: CN=CommScope Public Trust RSA Root-01,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 16:45:54 2021 -# Not Valid After : Sat Apr 28 16:45:53 2046 -# Fingerprint (SHA-256): 02:BD:F9:6E:2A:45:DD:9B:F1:8F:C7:E1:DB:DF:21:A0:37:9B:A3:C9:C2:61:03:44:CF:D8:D6:06:FE:C1:ED:81 -# Fingerprint (SHA1): 6D:0A:5F:F7:B4:23:06:B4:85:B3:B7:97:64:FC:AC:75:F5:33:F2:93 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust RSA Root-01" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\155\012\137\367\264\043\006\264\205\263\267\227\144\374\254\165 -\365\063\362\223 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\016\264\025\274\207\143\135\135\002\163\324\046\070\150\163\330 -END -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\122\123\101\040\122\157\157\164\055\060\061 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\076\003\111\201\165\026\164\061\216\114\253\325\305\220 -\051\226\305\071\020\335 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - -# -# Certificate "CommScope Public Trust RSA Root-02" -# -# Issuer: CN=CommScope Public Trust RSA Root-02,O=CommScope,C=US -# Serial Number:54:16:bf:3b:7e:39:95:71:8d:d1:aa:00:a5:86:0d:2b:8f:7a:05:4e -# Subject: CN=CommScope Public Trust RSA Root-02,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 17:16:43 2021 -# Not Valid After : Sat Apr 28 17:16:42 2046 -# Fingerprint (SHA-256): FF:E9:43:D7:93:42:4B:4F:7C:44:0C:1C:3D:64:8D:53:63:F3:4B:82:DC:87:AA:7A:9F:11:8F:C5:DE:E1:01:F1 -# Fingerprint (SHA1): EA:B0:E2:52:1B:89:93:4C:11:68:F2:D8:9A:AC:22:4C:A3:8A:57:AE -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust RSA Root-02" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\122\123\101\040\122\157\157\164\055\060\062 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\122\123\101\040\122\157\157\164\055\060\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\124\026\277\073\176\071\225\161\215\321\252\000\245\206 -\015\053\217\172\005\116 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\154\060\202\003\124\240\003\002\001\002\002\024\124 -\026\277\073\176\071\225\161\215\321\252\000\245\206\015\053\217 -\172\005\116\060\015\006\011\052\206\110\206\367\015\001\001\013 -\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125 -\123\061\022\060\020\006\003\125\004\012\014\011\103\157\155\155 -\123\143\157\160\145\061\053\060\051\006\003\125\004\003\014\042 -\103\157\155\155\123\143\157\160\145\040\120\165\142\154\151\143 -\040\124\162\165\163\164\040\122\123\101\040\122\157\157\164\055 -\060\062\060\036\027\015\062\061\060\064\062\070\061\067\061\066 -\064\063\132\027\015\064\066\060\064\062\070\061\067\061\066\064 -\062\132\060\116\061\013\060\011\006\003\125\004\006\023\002\125 -\123\061\022\060\020\006\003\125\004\012\014\011\103\157\155\155 -\123\143\157\160\145\061\053\060\051\006\003\125\004\003\014\042 -\103\157\155\155\123\143\157\160\145\040\120\165\142\154\151\143 -\040\124\162\165\163\164\040\122\123\101\040\122\157\157\164\055 -\060\062\060\202\002\042\060\015\006\011\052\206\110\206\367\015 -\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 -\002\001\000\341\372\016\373\150\000\022\310\115\325\254\042\304 -\065\001\073\305\124\345\131\166\143\245\177\353\301\304\152\230 -\275\062\215\027\200\353\135\272\321\142\075\045\043\031\065\024 -\351\177\211\247\033\142\074\326\120\347\064\225\003\062\261\264 -\223\042\075\247\342\261\355\346\173\116\056\207\233\015\063\165 -\012\336\252\065\347\176\345\066\230\242\256\045\236\225\263\062 -\226\244\053\130\036\357\077\376\142\064\110\121\321\264\215\102 -\255\140\332\111\152\225\160\335\322\000\342\314\127\143\002\173 -\226\335\111\227\133\222\116\225\323\371\313\051\037\030\112\370 -\001\052\322\143\011\156\044\351\211\322\345\307\042\114\334\163 -\206\107\000\252\015\210\216\256\205\175\112\351\273\063\117\016 -\122\160\235\225\343\174\155\226\133\055\075\137\241\203\106\135 -\266\343\045\270\174\247\031\200\034\352\145\103\334\221\171\066 -\054\164\174\362\147\006\311\211\311\333\277\332\150\277\043\355 -\334\153\255\050\203\171\057\354\070\245\015\067\001\147\047\232 -\351\063\331\063\137\067\241\305\360\253\075\372\170\260\347\054 -\237\366\076\237\140\340\357\110\351\220\105\036\005\121\170\032 -\054\022\054\134\050\254\015\242\043\236\064\217\005\346\242\063 -\316\021\167\023\324\016\244\036\102\037\206\315\160\376\331\056 -\025\075\035\273\270\362\123\127\333\314\306\164\051\234\030\263 -\066\165\070\056\017\124\241\370\222\037\211\226\117\273\324\356 -\235\351\073\066\102\265\012\073\052\324\144\171\066\020\341\371 -\221\003\053\173\040\124\315\015\031\032\310\101\062\064\321\260 -\231\341\220\036\001\100\066\265\267\372\251\345\167\165\244\042 -\201\135\260\213\344\047\022\017\124\210\306\333\205\164\346\267 -\300\327\246\051\372\333\336\363\223\227\047\004\125\057\012\157 -\067\305\075\023\257\012\000\251\054\213\034\201\050\327\357\206 -\061\251\256\362\156\270\312\152\054\124\107\330\052\210\056\257 -\301\007\020\170\254\021\242\057\102\360\067\305\362\270\126\335 -\016\142\055\316\055\126\176\125\362\247\104\366\053\062\364\043 -\250\107\350\324\052\001\170\317\152\303\067\250\236\145\322\054 -\345\372\272\063\301\006\104\366\346\317\245\015\247\146\010\064 -\212\054\363\002\003\001\000\001\243\102\060\100\060\017\006\003 -\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 -\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 -\003\125\035\016\004\026\004\024\107\320\347\261\042\377\235\054 -\365\331\127\140\263\261\261\160\225\357\141\172\060\015\006\011 -\052\206\110\206\367\015\001\001\013\005\000\003\202\002\001\000 -\206\151\261\115\057\351\237\117\042\223\150\216\344\041\231\243 -\316\105\123\033\163\104\123\000\201\141\315\061\343\010\272\201 -\050\050\172\222\271\266\250\310\103\236\307\023\046\115\302\330 -\345\125\234\222\135\120\330\302\053\333\376\346\250\227\317\122 -\072\044\303\145\144\134\107\061\243\145\065\023\303\223\271\367 -\371\121\227\273\244\360\142\207\305\326\006\323\227\203\040\251 -\176\273\266\041\302\245\015\204\000\341\362\047\020\203\272\335 -\003\201\325\335\150\303\146\020\310\321\166\264\263\157\051\236 -\000\371\302\051\365\261\223\031\122\151\032\054\114\240\213\340 -\025\232\061\057\323\210\225\131\156\345\304\263\120\310\024\010 -\112\233\213\023\203\261\244\162\262\073\166\063\101\334\334\252 -\246\007\157\035\044\022\237\310\166\275\057\331\216\364\054\356 -\267\322\070\020\044\066\121\057\343\134\135\201\041\247\332\273 -\116\377\346\007\250\376\271\015\047\154\273\160\132\125\172\023 -\351\361\052\111\151\307\137\207\127\114\103\171\155\072\145\351 -\060\134\101\356\353\167\245\163\022\210\350\277\175\256\345\304 -\250\037\015\216\034\155\120\002\117\046\030\103\336\217\125\205 -\261\013\067\005\140\311\125\071\022\004\241\052\317\161\026\237 -\066\121\111\277\160\073\236\147\234\373\173\171\311\071\034\170 -\254\167\221\124\232\270\165\012\201\122\227\343\146\141\153\355 -\076\070\036\226\141\125\341\221\124\214\355\214\044\037\201\311 -\020\232\163\231\053\026\116\162\000\077\124\033\370\215\272\213 -\347\024\326\266\105\117\140\354\226\256\303\057\002\116\135\235 -\226\111\162\000\262\253\165\134\017\150\133\035\145\302\137\063 -\017\036\017\360\073\206\365\260\116\273\234\367\352\045\005\334 -\255\242\233\113\027\001\276\102\337\065\041\035\255\253\256\364 -\277\256\037\033\323\342\073\374\263\162\163\034\233\050\220\211 -\023\075\035\301\000\107\011\226\232\070\033\335\261\317\015\302 -\264\104\363\226\225\316\062\072\217\064\234\340\027\307\136\316 -\256\015\333\207\070\345\077\133\375\233\031\341\061\101\172\160 -\252\043\153\001\341\105\114\315\224\316\073\236\055\347\210\002 -\042\364\156\350\310\354\326\074\363\271\262\327\167\172\254\173 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "CommScope Public Trust RSA Root-02" -# Issuer: CN=CommScope Public Trust RSA Root-02,O=CommScope,C=US -# Serial Number:54:16:bf:3b:7e:39:95:71:8d:d1:aa:00:a5:86:0d:2b:8f:7a:05:4e -# Subject: CN=CommScope Public Trust RSA Root-02,O=CommScope,C=US -# Not Valid Before: Wed Apr 28 17:16:43 2021 -# Not Valid After : Sat Apr 28 17:16:42 2046 -# Fingerprint (SHA-256): FF:E9:43:D7:93:42:4B:4F:7C:44:0C:1C:3D:64:8D:53:63:F3:4B:82:DC:87:AA:7A:9F:11:8F:C5:DE:E1:01:F1 -# Fingerprint (SHA1): EA:B0:E2:52:1B:89:93:4C:11:68:F2:D8:9A:AC:22:4C:A3:8A:57:AE -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CommScope Public Trust RSA Root-02" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\352\260\342\122\033\211\223\114\021\150\362\330\232\254\042\114 -\243\212\127\256 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\341\051\371\142\173\166\342\226\155\363\324\327\017\256\037\252 -END -CKA_ISSUER MULTILINE_OCTAL -\060\116\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\022\060\020\006\003\125\004\012\014\011\103\157\155\155\123\143 -\157\160\145\061\053\060\051\006\003\125\004\003\014\042\103\157 -\155\155\123\143\157\160\145\040\120\165\142\154\151\143\040\124 -\162\165\163\164\040\122\123\101\040\122\157\157\164\055\060\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\024\124\026\277\073\176\071\225\161\215\321\252\000\245\206 -\015\053\217\172\005\116 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "D-Trust SBR Root CA 1 2022" # @@ -26748,3 +26197,561 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "OISTE Client Root ECC G1" +# +# Issuer: CN=OISTE Client Root ECC G1,O=OISTE Foundation,C=CH +# Serial Number:54:ec:97:d6:8b:b4:c4:0b:21:6e:0e:b2:d0:53:c8:7a +# Subject: CN=OISTE Client Root ECC G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:31:40 2023 +# Not Valid After : Sun May 24 14:31:39 2048 +# Fingerprint (SHA-256): D9:A3:24:85:A8:CC:A8:55:39:CE:F1:2F:FF:FF:71:13:78:A1:78:51:D7:3D:A2:73:2A:B4:30:2D:76:3B:D6:2B +# Fingerprint (SHA1): C0:2B:13:F9:1D:77:56:ED:6C:92:83:F1:86:DF:2A:D5:1E:6E:F2:BC +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE Client Root ECC G1" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\103\154\151\145\156 +\164\040\122\157\157\164\040\105\103\103\040\107\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\103\154\151\145\156 +\164\040\122\157\157\164\040\105\103\103\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\124\354\227\326\213\264\304\013\041\156\016\262\320\123 +\310\172 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\064\060\202\001\272\240\003\002\001\002\002\020\124 +\354\227\326\213\264\304\013\041\156\016\262\320\123\310\172\060 +\012\006\010\052\206\110\316\075\004\003\003\060\113\061\013\060 +\011\006\003\125\004\006\023\002\103\110\061\031\060\027\006\003 +\125\004\012\014\020\117\111\123\124\105\040\106\157\165\156\144 +\141\164\151\157\156\061\041\060\037\006\003\125\004\003\014\030 +\117\111\123\124\105\040\103\154\151\145\156\164\040\122\157\157 +\164\040\105\103\103\040\107\061\060\036\027\015\062\063\060\065 +\063\061\061\064\063\061\064\060\132\027\015\064\070\060\065\062 +\064\061\064\063\061\063\071\132\060\113\061\013\060\011\006\003 +\125\004\006\023\002\103\110\061\031\060\027\006\003\125\004\012 +\014\020\117\111\123\124\105\040\106\157\165\156\144\141\164\151 +\157\156\061\041\060\037\006\003\125\004\003\014\030\117\111\123 +\124\105\040\103\154\151\145\156\164\040\122\157\157\164\040\105 +\103\103\040\107\061\060\166\060\020\006\007\052\206\110\316\075 +\002\001\006\005\053\201\004\000\042\003\142\000\004\210\116\150 +\037\311\236\276\072\004\133\025\303\065\364\314\120\305\010\255 +\070\156\250\074\322\002\272\314\253\045\375\165\100\375\147\031 +\237\033\012\135\366\313\026\173\371\134\036\202\334\025\104\324 +\234\074\155\141\223\105\364\117\317\142\271\337\076\123\215\232 +\324\112\336\210\252\013\246\361\324\141\326\036\164\325\030\262 +\305\115\114\357\200\173\354\015\353\203\071\124\226\243\143\060 +\141\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024\231 +\127\073\071\261\055\000\214\041\146\214\225\151\234\155\165\354 +\214\077\372\060\035\006\003\125\035\016\004\026\004\024\231\127 +\073\071\261\055\000\214\041\146\214\225\151\234\155\165\354\214 +\077\372\060\016\006\003\125\035\017\001\001\377\004\004\003\002 +\001\206\060\012\006\010\052\206\110\316\075\004\003\003\003\150 +\000\060\145\002\061\000\226\377\344\202\116\026\042\133\240\205 +\030\074\075\072\217\040\006\010\045\347\365\221\066\031\255\173 +\264\337\133\146\022\067\163\160\355\315\005\050\007\136\010\316 +\015\102\137\031\221\002\002\060\147\111\207\256\006\101\035\040 +\323\061\246\252\046\067\361\047\212\141\015\376\232\006\103\247 +\056\236\046\107\243\062\030\213\350\136\120\005\361\260\172\110 +\166\336\333\241\142\112\272\167 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "OISTE Client Root ECC G1" +# Issuer: CN=OISTE Client Root ECC G1,O=OISTE Foundation,C=CH +# Serial Number:54:ec:97:d6:8b:b4:c4:0b:21:6e:0e:b2:d0:53:c8:7a +# Subject: CN=OISTE Client Root ECC G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:31:40 2023 +# Not Valid After : Sun May 24 14:31:39 2048 +# Fingerprint (SHA-256): D9:A3:24:85:A8:CC:A8:55:39:CE:F1:2F:FF:FF:71:13:78:A1:78:51:D7:3D:A2:73:2A:B4:30:2D:76:3B:D6:2B +# Fingerprint (SHA1): C0:2B:13:F9:1D:77:56:ED:6C:92:83:F1:86:DF:2A:D5:1E:6E:F2:BC +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE Client Root ECC G1" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\300\053\023\371\035\167\126\355\154\222\203\361\206\337\052\325 +\036\156\362\274 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\121\257\341\070\170\021\354\345\310\237\135\233\065\362\114\054 +END +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\103\154\151\145\156 +\164\040\122\157\157\164\040\105\103\103\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\124\354\227\326\213\264\304\013\041\156\016\262\320\123 +\310\172 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "OISTE Client Root RSA G1" +# +# Issuer: CN=OISTE Client Root RSA G1,O=OISTE Foundation,C=CH +# Serial Number:34:17:6f:59:01:88:1b:aa:a5:dd:c8:48:bb:b4:3b:73 +# Subject: CN=OISTE Client Root RSA G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:23:29 2023 +# Not Valid After : Sun May 24 14:23:28 2048 +# Fingerprint (SHA-256): D0:2A:0F:99:4A:86:8C:66:39:5F:2E:7A:88:0D:F5:09:BD:0C:29:C9:6D:E1:60:15:A0:FD:50:1E:DA:4F:96:A9 +# Fingerprint (SHA1): BD:A8:13:20:E0:BF:97:ED:A2:8E:9E:18:5F:F2:D5:FE:E5:2B:13:D5 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE Client Root RSA G1" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\103\154\151\145\156 +\164\040\122\157\157\164\040\122\123\101\040\107\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\103\154\151\145\156 +\164\040\122\157\157\164\040\122\123\101\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\064\027\157\131\001\210\033\252\245\335\310\110\273\264 +\073\163 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\203\060\202\003\153\240\003\002\001\002\002\020\064 +\027\157\131\001\210\033\252\245\335\310\110\273\264\073\163\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\113 +\061\013\060\011\006\003\125\004\006\023\002\103\110\061\031\060 +\027\006\003\125\004\012\014\020\117\111\123\124\105\040\106\157 +\165\156\144\141\164\151\157\156\061\041\060\037\006\003\125\004 +\003\014\030\117\111\123\124\105\040\103\154\151\145\156\164\040 +\122\157\157\164\040\122\123\101\040\107\061\060\036\027\015\062 +\063\060\065\063\061\061\064\062\063\062\071\132\027\015\064\070 +\060\065\062\064\061\064\062\063\062\070\132\060\113\061\013\060 +\011\006\003\125\004\006\023\002\103\110\061\031\060\027\006\003 +\125\004\012\014\020\117\111\123\124\105\040\106\157\165\156\144 +\141\164\151\157\156\061\041\060\037\006\003\125\004\003\014\030 +\117\111\123\124\105\040\103\154\151\145\156\164\040\122\157\157 +\164\040\122\123\101\040\107\061\060\202\002\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000 +\060\202\002\012\002\202\002\001\000\272\117\376\376\124\023\265 +\204\074\274\340\323\061\361\035\156\334\304\123\161\372\344\071 +\121\103\166\175\222\037\201\177\000\153\101\302\346\332\334\030 +\115\154\027\131\160\011\063\142\354\151\210\055\260\335\131\371 +\141\140\140\126\361\266\264\357\353\207\320\023\376\303\317\157 +\217\176\071\130\121\263\211\002\216\124\225\036\042\137\253\050 +\005\103\047\370\105\364\011\102\046\224\376\275\023\170\273\221 +\362\020\020\234\015\147\174\332\144\040\353\172\060\032\272\110 +\015\170\124\052\231\061\064\253\313\246\152\347\014\147\071\146 +\244\046\250\047\050\347\363\346\074\163\344\053\314\157\061\056 +\023\164\141\313\150\346\322\063\316\122\274\176\145\044\132\041 +\201\061\103\252\262\234\321\030\347\141\074\122\257\200\211\351 +\064\106\336\371\115\231\132\155\035\275\306\045\321\223\125\216 +\370\047\222\103\072\214\225\105\100\343\211\030\247\206\301\131 +\230\312\333\046\034\023\300\214\201\271\230\260\255\151\255\156 +\030\343\173\142\101\365\255\066\376\013\264\173\040\137\237\251 +\156\371\231\202\022\122\322\212\304\124\170\264\174\367\101\233 +\003\347\007\136\263\302\271\111\144\147\222\026\304\140\220\016 +\260\202\175\063\255\320\066\352\321\166\153\174\210\107\230\254 +\033\371\264\120\214\141\201\151\330\061\363\215\372\076\362\365 +\113\257\316\303\035\357\137\050\033\353\030\326\240\130\122\062 +\276\102\157\315\111\227\042\301\160\271\323\343\140\117\336\203 +\202\240\116\060\275\163\123\302\275\027\375\240\300\230\217\352 +\016\027\007\346\103\225\040\116\333\021\250\371\343\323\270\047 +\107\014\047\333\022\353\201\125\314\165\333\237\323\027\103\304 +\373\353\212\050\155\351\257\104\120\132\103\373\361\071\342\223 +\120\317\230\374\104\226\130\070\245\245\355\105\303\122\102\005 +\247\357\345\074\244\254\075\347\326\251\126\005\252\260\303\247 +\031\344\345\075\327\127\104\155\224\021\037\312\160\310\374\271 +\114\314\101\132\203\164\123\220\170\317\326\324\056\117\261\252 +\115\056\365\321\010\133\072\144\357\310\247\250\172\141\354\354 +\246\325\210\116\266\124\324\130\221\302\045\144\221\274\012\024 +\075\222\024\232\265\013\006\351\057\002\003\001\000\001\243\143 +\060\141\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024 +\051\202\045\065\012\072\276\222\053\344\011\003\344\354\217\215 +\070\162\071\313\060\035\006\003\125\035\016\004\026\004\024\051 +\202\045\065\012\072\276\222\053\344\011\003\344\354\217\215\070 +\162\071\313\060\016\006\003\125\035\017\001\001\377\004\004\003 +\002\001\206\060\015\006\011\052\206\110\206\367\015\001\001\014 +\005\000\003\202\002\001\000\155\043\206\302\377\365\340\310\300 +\125\212\140\061\314\227\103\107\160\103\323\343\354\122\372\323 +\302\236\373\211\062\032\312\106\223\117\004\227\053\333\320\234 +\204\015\225\007\102\124\376\357\151\041\337\222\003\056\217\067 +\041\043\167\251\167\067\154\240\304\256\234\247\130\071\112\025 +\227\142\106\203\121\040\355\077\302\243\361\303\142\047\320\254 +\023\036\376\074\122\035\220\325\143\361\251\136\352\177\347\347 +\353\226\132\121\354\324\251\033\343\014\224\146\254\313\210\222 +\111\276\163\134\212\340\152\274\246\201\315\263\134\324\043\222 +\310\115\371\040\214\160\224\113\150\155\362\217\036\154\065\367 +\350\137\324\327\275\040\067\122\146\377\053\273\111\146\267\161 +\250\054\137\163\017\007\222\347\116\137\245\006\333\311\212\074 +\227\305\102\352\175\017\201\033\127\353\236\014\017\377\243\047 +\040\111\123\246\263\072\114\313\155\060\065\332\362\360\232\376 +\120\337\155\134\044\075\115\167\152\175\206\137\114\320\341\246 +\264\256\004\023\001\220\361\200\150\204\007\224\202\007\203\353 +\221\345\223\016\165\221\256\243\043\040\111\144\324\272\071\226 +\127\160\356\125\064\050\174\326\257\312\251\236\346\311\001\311 +\007\301\320\104\261\200\264\121\120\252\217\366\234\345\147\163 +\320\033\352\203\065\027\057\120\306\336\126\307\273\243\003\313 +\342\241\030\350\370\316\121\006\243\322\003\100\141\032\247\147 +\127\203\374\321\022\271\050\252\332\116\153\325\234\330\205\067 +\332\275\042\327\064\131\234\032\246\316\170\326\224\170\007\006 +\017\261\223\041\240\111\307\020\236\012\256\121\167\032\371\161 +\220\303\255\230\017\212\051\152\140\001\252\117\255\040\003\055 +\152\216\243\013\152\326\375\223\014\212\141\313\275\050\361\137 +\161\375\270\063\071\326\112\361\366\262\150\122\076\145\217\103 +\235\201\044\044\366\050\114\065\247\375\063\012\245\170\301\004 +\037\354\111\152\304\256\325\104\026\246\247\215\177\332\041\226 +\076\250\272\026\147\324\251\241\347\302\232\370\020\331\073\232 +\356\150\366\057\000\356\313\273\146\215\042\070\206\364\277\137 +\170\251\310\240\035\132\273\165\120\371\122\013\017\035\002\054 +\024\032\363\207\152\167\363 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "OISTE Client Root RSA G1" +# Issuer: CN=OISTE Client Root RSA G1,O=OISTE Foundation,C=CH +# Serial Number:34:17:6f:59:01:88:1b:aa:a5:dd:c8:48:bb:b4:3b:73 +# Subject: CN=OISTE Client Root RSA G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:23:29 2023 +# Not Valid After : Sun May 24 14:23:28 2048 +# Fingerprint (SHA-256): D0:2A:0F:99:4A:86:8C:66:39:5F:2E:7A:88:0D:F5:09:BD:0C:29:C9:6D:E1:60:15:A0:FD:50:1E:DA:4F:96:A9 +# Fingerprint (SHA1): BD:A8:13:20:E0:BF:97:ED:A2:8E:9E:18:5F:F2:D5:FE:E5:2B:13:D5 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE Client Root RSA G1" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\275\250\023\040\340\277\227\355\242\216\236\030\137\362\325\376 +\345\053\023\325 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\232\033\325\012\267\026\352\272\241\212\331\361\036\015\371\023 +END +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\103\154\151\145\156 +\164\040\122\157\157\164\040\122\123\101\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\064\027\157\131\001\210\033\252\245\335\310\110\273\264 +\073\163 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "OISTE Server Root ECC G1" +# +# Issuer: CN=OISTE Server Root ECC G1,O=OISTE Foundation,C=CH +# Serial Number:23:f9:c3:d6:35:af:8f:28:4b:1f:f0:54:ea:7e:97:9d +# Subject: CN=OISTE Server Root ECC G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:42:28 2023 +# Not Valid After : Sun May 24 14:42:27 2048 +# Fingerprint (SHA-256): EE:C9:97:C0:C3:0F:21:6F:7E:3B:8B:30:7D:2B:AE:42:41:2D:75:3F:C8:21:9D:AF:D1:52:0B:25:72:85:0F:49 +# Fingerprint (SHA1): 3B:F6:8B:09:AE:2A:92:7B:BA:E3:8D:3F:11:95:D9:E6:44:0C:45:E2 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE Server Root ECC G1" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\123\145\162\166\145 +\162\040\122\157\157\164\040\105\103\103\040\107\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\123\145\162\166\145 +\162\040\122\157\157\164\040\105\103\103\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\043\371\303\326\065\257\217\050\113\037\360\124\352\176 +\227\235 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\065\060\202\001\272\240\003\002\001\002\002\020\043 +\371\303\326\065\257\217\050\113\037\360\124\352\176\227\235\060 +\012\006\010\052\206\110\316\075\004\003\003\060\113\061\013\060 +\011\006\003\125\004\006\023\002\103\110\061\031\060\027\006\003 +\125\004\012\014\020\117\111\123\124\105\040\106\157\165\156\144 +\141\164\151\157\156\061\041\060\037\006\003\125\004\003\014\030 +\117\111\123\124\105\040\123\145\162\166\145\162\040\122\157\157 +\164\040\105\103\103\040\107\061\060\036\027\015\062\063\060\065 +\063\061\061\064\064\062\062\070\132\027\015\064\070\060\065\062 +\064\061\064\064\062\062\067\132\060\113\061\013\060\011\006\003 +\125\004\006\023\002\103\110\061\031\060\027\006\003\125\004\012 +\014\020\117\111\123\124\105\040\106\157\165\156\144\141\164\151 +\157\156\061\041\060\037\006\003\125\004\003\014\030\117\111\123 +\124\105\040\123\145\162\166\145\162\040\122\157\157\164\040\105 +\103\103\040\107\061\060\166\060\020\006\007\052\206\110\316\075 +\002\001\006\005\053\201\004\000\042\003\142\000\004\027\057\372 +\022\274\254\030\363\012\364\104\326\166\102\236\263\350\037\267 +\171\251\130\266\370\145\321\072\041\117\250\353\243\276\244\062 +\162\363\266\001\311\053\375\167\205\156\123\335\255\352\252\056 +\045\222\266\351\041\021\250\257\265\114\013\363\226\140\232\073 +\347\352\032\170\056\264\075\345\050\336\034\200\272\134\156\015 +\333\031\245\343\077\234\052\270\100\113\335\346\117\243\143\060 +\141\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024\067 +\115\210\145\317\374\075\212\325\243\361\111\300\116\014\020\157 +\102\264\234\060\035\006\003\125\035\016\004\026\004\024\067\115 +\210\145\317\374\075\212\325\243\361\111\300\116\014\020\157\102 +\264\234\060\016\006\003\125\035\017\001\001\377\004\004\003\002 +\001\206\060\012\006\010\052\206\110\316\075\004\003\003\003\151 +\000\060\146\002\061\000\251\052\060\035\320\302\237\220\121\121 +\100\076\225\124\041\315\026\146\367\123\154\010\026\071\320\022 +\174\177\143\033\337\343\070\000\071\331\055\123\040\105\013\034 +\140\147\061\103\045\355\002\061\000\222\211\256\351\134\142\203 +\142\141\371\055\127\253\126\271\021\335\045\276\152\116\112\032 +\202\153\334\317\323\274\112\263\074\327\056\233\333\370\050\151 +\274\153\055\354\061\241\072\343\127 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "OISTE Server Root ECC G1" +# Issuer: CN=OISTE Server Root ECC G1,O=OISTE Foundation,C=CH +# Serial Number:23:f9:c3:d6:35:af:8f:28:4b:1f:f0:54:ea:7e:97:9d +# Subject: CN=OISTE Server Root ECC G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:42:28 2023 +# Not Valid After : Sun May 24 14:42:27 2048 +# Fingerprint (SHA-256): EE:C9:97:C0:C3:0F:21:6F:7E:3B:8B:30:7D:2B:AE:42:41:2D:75:3F:C8:21:9D:AF:D1:52:0B:25:72:85:0F:49 +# Fingerprint (SHA1): 3B:F6:8B:09:AE:2A:92:7B:BA:E3:8D:3F:11:95:D9:E6:44:0C:45:E2 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "OISTE Server Root ECC G1" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\073\366\213\011\256\052\222\173\272\343\215\077\021\225\331\346 +\104\014\105\342 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\102\247\322\065\256\002\222\333\031\166\010\336\057\005\264\324 +END +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\123\145\162\166\145 +\162\040\122\157\157\164\040\105\103\103\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\043\371\303\326\065\257\217\050\113\037\360\124\352\176 +\227\235 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate " OISTE Server Root RSA G1" +# +# Issuer: CN=OISTE Server Root RSA G1,O=OISTE Foundation,C=CH +# Serial Number:55:a5:d9:67:94:28:c6:ed:0c:fa:27:dd:5b:01:4d:18 +# Subject: CN=OISTE Server Root RSA G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:37:16 2023 +# Not Valid After : Sun May 24 14:37:15 2048 +# Fingerprint (SHA-256): 9A:E3:62:32:A5:18:9F:FD:DB:35:3D:FD:26:52:0C:01:53:95:D2:27:77:DA:C5:9D:B5:7B:98:C0:89:A6:51:E6 +# Fingerprint (SHA1): F7:00:34:25:94:88:68:31:E4:34:87:3F:70:FE:86:B3:86:9F:F0:6E +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 " OISTE Server Root RSA G1" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\123\145\162\166\145 +\162\040\122\157\157\164\040\122\123\101\040\107\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\123\145\162\166\145 +\162\040\122\157\157\164\040\122\123\101\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\125\245\331\147\224\050\306\355\014\372\047\335\133\001 +\115\030 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\203\060\202\003\153\240\003\002\001\002\002\020\125 +\245\331\147\224\050\306\355\014\372\047\335\133\001\115\030\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\113 +\061\013\060\011\006\003\125\004\006\023\002\103\110\061\031\060 +\027\006\003\125\004\012\014\020\117\111\123\124\105\040\106\157 +\165\156\144\141\164\151\157\156\061\041\060\037\006\003\125\004 +\003\014\030\117\111\123\124\105\040\123\145\162\166\145\162\040 +\122\157\157\164\040\122\123\101\040\107\061\060\036\027\015\062 +\063\060\065\063\061\061\064\063\067\061\066\132\027\015\064\070 +\060\065\062\064\061\064\063\067\061\065\132\060\113\061\013\060 +\011\006\003\125\004\006\023\002\103\110\061\031\060\027\006\003 +\125\004\012\014\020\117\111\123\124\105\040\106\157\165\156\144 +\141\164\151\157\156\061\041\060\037\006\003\125\004\003\014\030 +\117\111\123\124\105\040\123\145\162\166\145\162\040\122\157\157 +\164\040\122\123\101\040\107\061\060\202\002\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000 +\060\202\002\012\002\202\002\001\000\252\256\364\253\202\317\373 +\345\067\013\347\325\226\255\220\350\113\051\334\125\140\343\314 +\274\263\274\055\222\271\344\243\172\361\201\264\236\162\162\103 +\337\077\253\013\046\264\356\173\032\151\373\050\320\162\134\112 +\155\151\231\360\143\036\014\322\261\377\326\214\064\320\356\333 +\254\110\271\352\260\024\216\330\007\251\044\230\335\351\011\276 +\250\042\033\131\071\321\047\207\334\034\315\370\373\263\353\351 +\223\170\355\017\316\067\174\046\167\156\241\330\054\041\114\344 +\212\117\307\023\074\156\307\325\023\227\262\250\333\044\151\203 +\126\323\151\313\202\022\273\235\033\362\370\064\362\230\053\052 +\216\004\147\366\343\207\241\035\255\156\316\066\164\016\136\063 +\073\313\333\121\227\224\152\225\074\316\030\132\156\113\306\374 +\007\217\056\032\271\112\367\144\064\051\334\246\215\120\341\215 +\213\113\345\110\033\156\056\200\020\077\344\237\033\145\077\021 +\264\352\127\151\237\264\000\353\205\044\231\044\365\041\235\227 +\252\373\064\177\002\153\025\220\255\273\236\132\031\177\244\214 +\330\372\155\050\374\070\307\343\114\255\152\316\331\116\223\222 +\216\314\014\147\277\013\113\226\316\146\147\123\150\313\027\021 +\216\131\367\254\234\033\271\216\150\104\267\030\257\346\345\017 +\145\334\225\011\260\223\022\265\037\076\224\245\307\210\165\041 +\261\336\011\044\052\114\342\274\354\114\147\107\302\051\210\271 +\012\272\371\301\164\316\214\030\046\145\332\367\157\306\214\173 +\150\134\013\356\143\300\136\113\361\116\314\237\057\017\341\350 +\232\172\223\361\340\310\333\277\047\346\145\051\173\066\340\063 +\025\163\362\235\153\204\010\150\053\066\007\053\047\314\170\330 +\152\207\016\107\164\364\252\240\023\135\144\176\364\333\024\256 +\373\072\344\057\301\145\343\271\172\100\154\360\006\267\173\050 +\233\327\341\137\070\163\224\254\331\160\223\055\334\204\257\106 +\034\242\172\054\077\201\046\102\347\324\330\305\154\204\146\021 +\213\167\153\124\034\243\265\330\020\360\256\051\367\147\010\210 +\027\134\270\227\171\317\352\053\052\356\130\063\345\155\351\051 +\252\145\001\015\202\023\354\045\013\135\054\100\162\025\051\323 +\220\054\367\032\103\325\152\360\151\002\003\001\000\001\243\143 +\060\141\060\017\006\003\125\035\023\001\001\377\004\005\060\003 +\001\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024 +\362\311\301\017\015\143\000\273\354\105\016\112\037\265\261\263 +\066\315\016\215\060\035\006\003\125\035\016\004\026\004\024\362 +\311\301\017\015\143\000\273\354\105\016\112\037\265\261\263\066 +\315\016\215\060\016\006\003\125\035\017\001\001\377\004\004\003 +\002\001\206\060\015\006\011\052\206\110\206\367\015\001\001\014 +\005\000\003\202\002\001\000\064\147\171\262\072\306\345\075\367 +\043\162\271\011\357\222\255\047\037\240\116\012\262\365\332\027 +\014\242\205\322\176\222\121\375\025\145\327\134\153\144\026\356 +\212\105\312\014\103\066\104\065\331\177\376\171\072\034\350\306 +\344\075\153\167\324\041\020\343\366\363\040\116\251\276\211\363 +\034\234\251\337\274\060\072\027\321\062\103\320\252\212\162\034 +\121\050\114\335\066\310\344\055\147\175\221\207\034\235\274\374 +\253\050\226\136\141\134\270\042\063\030\110\026\120\352\312\057 +\351\245\111\334\177\074\244\031\274\066\255\222\342\271\364\113 +\325\353\010\255\347\170\376\027\300\135\207\167\350\147\167\117 +\000\146\257\364\261\003\072\276\022\174\101\065\345\364\246\033 +\107\213\313\171\367\326\277\027\156\116\145\360\370\332\127\301 +\224\201\345\172\126\015\273\106\177\157\221\375\175\346\027\344 +\201\047\273\005\210\126\335\040\245\367\230\055\221\031\151\061 +\137\233\060\362\231\255\162\100\226\314\330\167\146\233\264\325 +\016\262\020\376\024\252\303\200\161\235\075\215\350\175\024\154 +\141\144\206\106\246\327\124\305\266\327\220\026\106\245\205\312 +\236\072\343\346\023\026\266\025\043\314\251\051\122\375\000\306 +\366\220\216\126\217\211\010\335\226\252\346\323\152\251\206\065 +\366\325\105\170\102\112\106\374\003\310\136\330\146\366\105\145 +\044\264\276\207\173\125\040\235\367\235\265\052\374\271\142\031 +\313\154\073\257\323\155\070\154\253\173\246\036\215\374\351\236 +\376\153\025\271\333\202\232\313\230\337\163\241\220\240\240\305 +\340\350\001\250\243\024\234\310\301\232\254\025\120\063\215\355 +\174\052\213\163\225\100\103\046\374\201\244\052\137\071\220\267 +\047\313\121\167\370\226\223\036\317\362\167\175\037\106\223\242 +\131\036\225\104\305\055\165\144\260\326\371\340\074\151\352\004 +\265\034\013\342\106\104\115\103\073\227\111\161\021\275\044\266 +\302\255\162\124\006\376\153\030\371\167\333\051\054\122\236\155 +\167\173\142\375\017\115\216\230\062\060\060\161\022\326\045\065 +\343\237\370\157\234\265\353\152\033\255\352\020\323\226\026\162 +\006\041\045\306\114\274\217\160\273\014\344\136\042\203\055\322 +\276\376\205\133\264\344\275 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for " OISTE Server Root RSA G1" +# Issuer: CN=OISTE Server Root RSA G1,O=OISTE Foundation,C=CH +# Serial Number:55:a5:d9:67:94:28:c6:ed:0c:fa:27:dd:5b:01:4d:18 +# Subject: CN=OISTE Server Root RSA G1,O=OISTE Foundation,C=CH +# Not Valid Before: Wed May 31 14:37:16 2023 +# Not Valid After : Sun May 24 14:37:15 2048 +# Fingerprint (SHA-256): 9A:E3:62:32:A5:18:9F:FD:DB:35:3D:FD:26:52:0C:01:53:95:D2:27:77:DA:C5:9D:B5:7B:98:C0:89:A6:51:E6 +# Fingerprint (SHA1): F7:00:34:25:94:88:68:31:E4:34:87:3F:70:FE:86:B3:86:9F:F0:6E +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 " OISTE Server Root RSA G1" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\367\000\064\045\224\210\150\061\344\064\207\077\160\376\206\263 +\206\237\360\156 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\043\247\236\324\160\270\271\024\127\101\212\176\104\131\342\150 +END +CKA_ISSUER MULTILINE_OCTAL +\060\113\061\013\060\011\006\003\125\004\006\023\002\103\110\061 +\031\060\027\006\003\125\004\012\014\020\117\111\123\124\105\040 +\106\157\165\156\144\141\164\151\157\156\061\041\060\037\006\003 +\125\004\003\014\030\117\111\123\124\105\040\123\145\162\166\145 +\162\040\122\157\157\164\040\122\123\101\040\107\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\125\245\331\147\224\050\306\355\014\372\047\335\133\001 +\115\030 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/test/functional/buildAndPackage/src/net/adoptium/test/BundledFreetypeTest.java b/test/functional/buildAndPackage/src/net/adoptium/test/BundledFreetypeTest.java index 7f751a597..e2ee4ad23 100644 --- a/test/functional/buildAndPackage/src/net/adoptium/test/BundledFreetypeTest.java +++ b/test/functional/buildAndPackage/src/net/adoptium/test/BundledFreetypeTest.java @@ -26,8 +26,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static net.adoptium.test.JdkPlatform.OperatingSystem; -import static net.adoptium.test.JdkVersion.VM; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -75,25 +73,12 @@ public void freetypeOnlyBundledOnCertainPlatforms() throws IOException { .filter(name -> freetypePattern.matcher(name).matches()) .collect(Collectors.toSet()); - if (jdkVersion.isNewerOrEqual(21)) { - // jdk-21+ uses "bundled" FreeType - assertTrue(freetypeFiles.size() > 0, - "Expected libfreetype.dylib to be bundled but it is not."); - } else if (jdkPlatform.runsOn(OperatingSystem.MACOS)) { - assertTrue(freetypeFiles.size() > 0, - "Expected libfreetype.dylib to be bundled but it is not."); - } else if (jdkPlatform.runsOn(OperatingSystem.WINDOWS)) { - assertTrue(freetypeFiles.size() > 0, - "Expected freetype.dll to be bundled, but it is not."); - } else if (jdkPlatform.runsOn(OperatingSystem.AIX) - && (jdkVersion.isNewerOrEqual(13) || (jdkVersion.usesVM(VM.OPENJ9) && jdkVersion.isNewerOrEqual(8)))) { - assertTrue(freetypeFiles.size() > 0, - "Expected libfreetype.so to be bundled, but it is not."); + if (jdkVersion.isNewerOrEqual(8)) { + // all JDKs now uses bundled freetype + assertTrue(freetypeFiles.size() > 0, "Expected libfreetype.(dll|dylib|so) to be bundled but it is not."); } else { - LOGGER.info("Found freetype-related files: " - + freetypeFiles.toString()); - assertEquals(freetypeFiles.size(), 0, - "Expected libfreetype not to be bundled but it is."); + LOGGER.info("Found freetype-related files: " + freetypeFiles.toString()); + assertEquals(freetypeFiles.size(), 0, "Expected libfreetype not to be bundled but it is."); } } } diff --git a/test/functional/buildAndPackage/src/net/adoptium/test/VerifyCACertsTest.java b/test/functional/buildAndPackage/src/net/adoptium/test/VerifyCACertsTest.java index 29c2f61d2..032f88a1a 100644 --- a/test/functional/buildAndPackage/src/net/adoptium/test/VerifyCACertsTest.java +++ b/test/functional/buildAndPackage/src/net/adoptium/test/VerifyCACertsTest.java @@ -40,7 +40,7 @@ public class VerifyCACertsTest { private static final JdkVersion JDK_VERSION = new JdkVersion(); // Expect matching certs number - private static final int EXPECTED_COUNT = 146; + private static final int EXPECTED_COUNT = 144; /* TODO: add up to 141 certs private static final Map EXPFP_MAP = new HashMap<>() { diff --git a/tooling/build_autotriage/autotriage_regexes.sh b/tooling/build_autotriage/autotriage_regexes.sh index 84a826036..6486adc3b 100644 --- a/tooling/build_autotriage/autotriage_regexes.sh +++ b/tooling/build_autotriage/autotriage_regexes.sh @@ -153,6 +153,12 @@ p="1" s="1" storeInArrays "${r}" "${m}" "${p}" "${s}" +r="Failed.in.branch.(extended|sanity|special|dev).jck" +m="JCK tests could not be triggered." +p="1" +s="1" +storeInArrays "${r}" "${m}" "${p}" "${s}" + r="Failed\sto\scopy\sartifacts" m="Artifacts could not be transferred between jobs. May require a jenkins restart if other causes are not apparent." p="1" diff --git a/tooling/build_autotriage/build_autotriage.sh b/tooling/build_autotriage/build_autotriage.sh index 702afc9eb..58c806378 100644 --- a/tooling/build_autotriage/build_autotriage.sh +++ b/tooling/build_autotriage/build_autotriage.sh @@ -59,7 +59,6 @@ temurinPlatforms+=("mac-aarch64"); platformStart+=(11); platformEnd+=(9 temurinPlatforms+=("mac-x64"); platformStart+=(8); platformEnd+=(99) temurinPlatforms+=("windows-aarch64"); platformStart+=(21); platformEnd+=(99) temurinPlatforms+=("windows-x64"); platformStart+=(8); platformEnd+=(99) -temurinPlatforms+=("windows-x86-32"); platformStart+=(8); platformEnd+=(17) # This stores any error messages that did not terminate the triage script altogether. errorLog() { @@ -385,45 +384,6 @@ identifyFailedBuildsInTimerPipelines() { fi fi done - - # Finally, if this is jdk8, we handle the latest Solaris builds seperately because their URL is unique to them. - if [[ "${jdkJenkinsJobVersion}" == "jdk8u" ]]; then - # Solaris x64 - solarisJobURL="https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-x64-temurin-simplepipe/lastCompletedBuild/" - solarisJobData=$(wget -q -O - "${solarisJobURL}api/xml") - if [[ "${solarisJobData}" =~ \[A-Z]+\<\/result\> ]]; then - solarisJobURL=$(wget -q -O - "${solarisJobURL}api/xml?xpath=/workflowRun/url") - solarisJobURL=${solarisJobURL:5:-7} - echo "Identified a Solaris x64 job. Checking status now. URL: ${solarisJobURL}" - if [[ ! "${solarisJobData}" =~ \(SUCCESS|UNSTABLE)\<\/result\> ]]; then - solarisJobURL=$(wget -q -O - "${solarisJobURL}api/xml?xpath=/workflowRun/url") - solarisJobURL=${solarisJobURL:5:-7} - echo "Identified a failed build for triage: ${solarisJobURL}" - arrayOfFailedJobs+=("${solarisJobURL}") - else - echo "Solaris x64 job did not fail." - fi - else - errorLog "Could not find a valid job for Solaris x64. URL: ${solarisJobURL}" - fi - - # Solaris sparcv9 - solarisJobURL="https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-sparcv9-temurin-simplepipe/lastCompletedBuild/" - solarisJobData=$(wget -q -O - "${solarisJobURL}api/xml") - if [[ "${solarisJobData}" =~ \[A-Z]+\<\/result\> ]]; then - solarisJobURL=$(wget -q -O - "${solarisJobURL}api/xml?xpath=/workflowRun/url") - solarisJobURL=${solarisJobURL:5:-7} - echo "Identified a Solaris sparcv9 job. Checking status now. URL: ${solarisJobURL}" - if [[ ! "${solarisJobData}" =~ \(SUCCESS|UNSTABLE)\<\/result\> ]]; then - echo "Identified a failed build for triage: ${solarisJobURL}" - arrayOfFailedJobs+=("${solarisJobURL}") - else - echo "Solaris sparcv9 job did not fail." - fi - else - errorLog "Could not find a valid job for Solaris sparcv9. URL: ${solarisJobURL}" - fi - fi echo "Build numbers found, and failures will be added to the array of builds to be triaged." done } @@ -450,6 +410,9 @@ buildFailureTriager() { for regexIndex in "${!arrayOfRegexes[@]}"; do # When a regex matches, store the id of the regex we matched against, and also the line of output that matched the regex. if [[ "$jobOutputLine" =~ ${arrayOfRegexes[regexIndex]} ]]; then + # If regex matched a Test_Job_Auto_Gen failure; ignore it. + # These are rerun when they fail, and rarely cause build job failure. + [[ "$jobOutputLine" =~ Test_Job_Auto_Gen.#[0-9]+.completed\:.FAILURE ]] && continue 2 arrayOfRegexsForFailedJobs+=("$regexIndex") arrayOfErrorLinesForFailedJobs+=("$jobOutputLine") if [[ ${arrayOfFailureSources[regexIndex]} = 0 ]]; then diff --git a/tooling/validateSBOM.sh b/tooling/validateSBOM.sh index a022d9e0d..510b6203d 100755 --- a/tooling/validateSBOM.sh +++ b/tooling/validateSBOM.sh @@ -69,11 +69,6 @@ arg_parser() { exit 1 fi - if [ -z "$SOURCE_TAG" ]; then - echo "ERROR: validateSBOM.sh: second argument must not be empty." - exit 1 - fi - TAG_CHECK="" if [ "$JDK_MAJOR_VERSION" -eq "8" ]; then echo "$SOURCE_TAG" | grep -q -e "^jdk8u[0-9][0-9]*-b[0-9][0-9]*_adopt\$" \ @@ -96,7 +91,7 @@ arg_parser() { echo "WARNING: validateSBOM.sh: SOURCE_TAG does not use a valid upstream tag structure." echo "INFO: validateSBOM.sh: Build is presumed to be a personal or dev build." echo "INFO: validateSBOM.sh: SCM and SHA checks will be skipped." - SOURCE_TAG="null" + SOURCE_TAG="" fi if [ -z "$SBOM_LOCATION" ]; then @@ -206,7 +201,7 @@ validate_sbom_cyclonedx() { ######################################################################################################################## validate_sbom_content() { # shellcheck disable=SC2086 - echo "validateSBOM.sh: Running validateSBOMcontent.sh" + echo "validateSBOM.sh: Running command: sh validateSBOMcontent.sh \"$SBOM_LOCATION\" \"$JDK_MAJOR_VERSION\" \"$SOURCE_TAG\"" if sh "${SCRIPT_DIR}/validateSBOMcontent.sh" "$SBOM_LOCATION" "$JDK_MAJOR_VERSION" "$SOURCE_TAG"; then echo "validateSBOMcontent.sh: PASSED" diff --git a/tooling/validateSBOMcontent.sh b/tooling/validateSBOMcontent.sh index ffc11b73e..435259c25 100755 --- a/tooling/validateSBOMcontent.sh +++ b/tooling/validateSBOMcontent.sh @@ -31,14 +31,12 @@ COMPILER=$(jq '.components[0].properties[] | select(.name|test("Build Tools Summ SCM_REF=$( jq '.components[0].properties[] | select(.name|test("SCM Ref")) | .value' "$SBOMFILE" | tr -d \") EXPECTED_COMPILER="gcc (GNU Compiler Collection)" +EXPECTED_FREETYPE=2.13.3 # Bundled version EXPECTED_GLIBC="" EXPECTED_GCC="" # [ "${MAJORVERSION}" = "17" ] && EXPECTED_GCC=10.3.0 EXPECTED_ALSA="" -#EXPECTED_FREETYPE=N.A # https://github.com/adoptium/temurin-build/issues/3493 -#EXPECTED_FREETYPE=https://github.com/freetype/freetype/commit/86bc8a95056c97a810986434a3f268cbe67f2902 if echo "$SBOMFILE" | grep _solaris_; then - EXPECTED_FREETYPE=2.4.9 EXPECTED_COMPILER="solstudio (Oracle Solaris Studio)" elif echo "$SBOMFILE" | grep _aix_; then if [ "$MAJORVERSION" -le 21 ]; then @@ -46,31 +44,22 @@ elif echo "$SBOMFILE" | grep _aix_; then else EXPECTED_COMPILER="clang (clang/LLVM)" fi - if [ "$MAJORVERSION" -lt 17 ]; then - EXPECTED_FREETYPE=2.8.0 - else - EXPECTED_FREETYPE=2.13.3 # Bundled version - fi elif echo "$SBOMFILE" | grep _alpine-linux_ > /dev/null; then - EXPECTED_FREETYPE=2.11.1 EXPECTED_ALSA=1.1.6 EXPECTED_GCC=10.3.1 elif echo "$SBOMFILE" | grep _linux_; then if [ "$MAJORVERSION" -lt 20 ] && echo "$SBOMFILE" | grep x64 > /dev/null; then # CentOS6 EXPECTED_GLIBC=2.12 - EXPECTED_FREETYPE=2.3.11 elif echo "$SBOMFILE" | grep _arm_ > /dev/null; then # Ubuntu 16.04 EXPECTED_GLIBC=2.23 - EXPECTED_FREETYPE=2.6.1 else # CentOS7 EXPECTED_GLIBC=2.17 - EXPECTED_FREETYPE=2.8.0 fi [ "${MAJORVERSION}" = "8" ] && EXPECTED_GCC=7.5.0 [ "${MAJORVERSION}" = "11" ] && EXPECTED_GCC=7.5.0 [ "${MAJORVERSION}" = "17" ] && EXPECTED_GCC=10.3.0 - [ "${MAJORVERSION}" -ge 20 ] && EXPECTED_GCC=11.3.0 && EXPECTED_FREETYPE=Unknown + [ "${MAJORVERSION}" -ge 20 ] && EXPECTED_GCC=11.3.0 [ "${MAJORVERSION}" -ge 25 ] && EXPECTED_GCC=14.2.0 EXPECTED_ALSA=1.1.8 if echo "$SBOMFILE" | grep _aarch64_ > /dev/null; then @@ -80,39 +69,26 @@ elif echo "$SBOMFILE" | grep _linux_; then EXPECTED_GCC=14.2.0 EXPECTED_GLIBC=2.27 # Fedora 28 EXPECTED_ALSA=1.1.1 - [ "${MAJORVERSION}" -lt 20 ] && EXPECTED_FREETYPE=2.6.5 fi #elif echo $SBOMFILE | grep _mac_; then # EXPECTED_COMPILER="clang (clang/LLVM from Xcode 10.3)" elif echo "$SBOMFILE" | grep 64_windows_; then - EXPECTED_FREETYPE=2.8.1 EXPECTED_COMPILER="microsoft (Microsoft Visual Studio 2022)" - if [ "${MAJORVERSION}" = "11" ] || [ "${MAJORVERSION}" = "17" ]; then - EXPECTED_FREETYPE=2.13.3 # Bundled version - fi elif echo "$SBOMFILE" | grep _x86-32_windows_; then - EXPECTED_FREETYPE=2.13.3 # Bundled version EXPECTED_COMPILER="microsoft (Microsoft Visual Studio 2022)" - if [ "${MAJORVERSION}" = "8" ]; then - EXPECTED_FREETYPE=2.5.3 - fi elif echo "$SBOMFILE" | grep _mac_; then # NOTE: mac/x64 native builds >=11 were using "clang (clang/LLVM from Xcode 10.3)" - EXPECTED_FREETYPE=2.13.3 # Bundled version EXPECTED_COMPILER="clang (clang/LLVM from Xcode 15.2)" # shellcheck disable=SC2166 if [ "${MAJORVERSION}" = "8" ] && echo "$SBOMFILE" | grep _x64_; then EXPECTED_COMPILER="clang (clang/LLVM)" - EXPECTED_FREETYPE=2.9.1 fi fi -[ "${MAJORVERSION}" -ge 20 ] && EXPECTED_FREETYPE=2.13.3 # Bundled version - RC=0 -# Skip SCM check if EXPECTED_SCM_REF parameter is null -if [ "${EXPECTED_SCM_REF}" != "null" ]; then +# Skip SCM check if EXPECTED_SCM_REF parameter is empty +if [ -n "${EXPECTED_SCM_REF}" ]; then [ "${EXPECTED_SCM_REF}" != "${SCM_REF}" ] && echo "ERROR: SCM_REF not ${EXPECTED_SCM_REF} (SBOM has ${SCM_REF})" && RC=1 fi if echo "$SBOMFILE" | grep 'linux_'; then @@ -131,18 +107,27 @@ echo "BOOTJDK is ${BOOTJDK}" echo "FREETYPE is ${FREETYPE}" # shellcheck disable=SC3037 echo -n "Checking for JDK source SHA validity: " -GITSHA=$(jq '.components[].properties[] | select(.name|test("OpenJDK Source Commit")) | .value' "$1" | tr -d \" | uniq) -GITREPO=$(echo "$GITSHA" | cut -d/ -f1-5) -GITSHA=$( echo "$GITSHA" | cut -d/ -f7) -if ! git ls-remote "${GITREPO}" | grep "${GITSHA}"; then - echo "ERROR: git sha of source repo not found" - echo "GITREPO: ${GITREPO}" - echo "GITSHA: ${GITSHA}" - RC=1 +GITURL=$(jq '.components[].properties[] | select(.name|test("OpenJDK Source Commit")) | .value' "$1" | tr -d \" | uniq) +GITREPO=$(echo "$GITURL" | cut -d/ -f1-5) +GITSHA=$( echo "$GITURL" | cut -d/ -f7) +if [ -z "${EXPECTED_SCM_REF}" ]; then + if ! curl --silent --fail -I "$GITURL" > /dev/null; then + echo "ERROR: git sha of source commit not found" + echo "GITREPO: ${GITREPO}" + echo "GITSHA: ${GITSHA}" + RC=1 + fi +else + if ! git ls-remote "${GITREPO}" | grep "${GITSHA}"; then + echo "ERROR: git sha of source repo not found" + echo "GITREPO: ${GITREPO}" + echo "GITSHA: ${GITSHA}" + RC=1 + fi fi # shellcheck disable=SC3037 -if [ "${EXPECTED_SCM_REF}" != "null" ]; then +if [ -n "${EXPECTED_SCM_REF}" ]; then echo -n "Checking for temurin-build SHA validity: " GITSHA=$(jq '.components[].properties[] | select(.name|test("Temurin Build Ref")) | .value' "$1" | tr -d \" | uniq) GITREPO=$(echo "$GITSHA" | cut -d/ -f1-5) @@ -160,7 +145,7 @@ if [ "${EXPECTED_SCM_REF}" != "null" ]; then fi fi else - echo "The SCM_REF argument was set to null; skipping SHA check." + echo "The SCM_REF argument was set to an empty string; skipping SHA check." fi if [ "$RC" != "0" ]; then