Release 1.1.89.2

Release 1.1.89.2 (#10)
altera-opensource · May 10, 2023 · bddcda6 · bddcda6
2 parents b4a205e df207bf
commit bddcda6
Show file tree

Hide file tree

Showing 895 changed files with 4,757 additions and 3,261 deletions.
diff --git a/CryptoCore/build.gradle b/CryptoCore/build.gradle
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -40,15  40,16 @@ buildscript {
 }
 
 plugins {
     alias(libs.plugins.lombok)
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.modernizer)
     id 'java-library'
     id 'idea'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
-ext['junit-jupiter.version'] = "${junit5_version}"
-
 jar {
     archiveBaseName.set('CryptoCore')
     archiveVersion.set(getBuildVersion())
@@ -76,17  77,14 @@ repositories {
 
 dependencies {
     implementation project(':Utils')
-    implementation "org.bouncycastle:bcpkix-jdk15on:${bouncycastle_version}"
-    implementation "org.slf4j:slf4j-api:${slf4j_version}"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit5_version}"
-    testImplementation "org.junit.platform:junit-platform-launcher:${junit5_platform_version}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junit5_version}"
-    testImplementation "org.junit.platform:junit-platform-runner:${junit5_platform_version}"
-    testImplementation "org.mockito:mockito-inline:${mockito_version}"
-    testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
-    testImplementation "com.github.valfirst:slf4j-test:${slf4j_test_version}"
     implementation libs.bouncycastle
     implementation libs.slf4j.api
 
     testImplementation platform(libs.junit.bom)
     testImplementation libs.junit.jupiter
     testImplementation libs.bundles.mockito
     testImplementation libs.slf4j.test
 }
 
 def getBuildVersion() {

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/CertificateEncoder.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/CertificateEncoder.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/CryptoUtils.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/CryptoUtils.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/KeystoreUtils.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/KeystoreUtils.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/aesctr/AesCounterModeProvider.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/aesctr/AesCounterModeProvider.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/aesctr/AesCtrIvProvider.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/aesctr/AesCtrIvProvider.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/aesctr/IIvProvider.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/aesctr/IIvProvider.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/aesgcm/AesGcmProvider.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/aesgcm/AesGcmProvider.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/asn1/Asn1ParsingUtils.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/asn1/Asn1ParsingUtils.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/constants/CryptoConstants.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/constants/CryptoConstants.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/constants/SecurityKeyType.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/constants/SecurityKeyType.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Base.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Base.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Bzip.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Bzip.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Regular.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Regular.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Type.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/crc/Crc32Type.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/curve/CurvePoint.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/curve/CurvePoint.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -34,7  34,6 @@
 package com.intel.bkp.crypto.curve;
 
 import com.intel.bkp.crypto.CryptoUtils;
-import com.intel.bkp.crypto.constants.CryptoConstants;
 import com.intel.bkp.crypto.interfaces.ICurveSpec;
 import com.intel.bkp.utils.ByteBufferSafe;
 import com.intel.bkp.utils.PaddingUtils;
@@ -51,6  50,7 @@
 
 import static com.intel.bkp.crypto.asn1.Asn1ParsingUtils.extractR;
 import static com.intel.bkp.crypto.asn1.Asn1ParsingUtils.extractS;
 import static com.intel.bkp.crypto.constants.CryptoConstants.EC_KEY;
 import static com.intel.bkp.utils.HexConverter.fromHex;
 import static com.intel.bkp.utils.HexConverter.toHex;
 
@@ -107,9  107,14 @@ public static CurvePoint fromPubKey(byte[] pointXY, CurveSpec curveSpec) {
         return from(pointX, pointY, curveSpec);
     }
 
     public static CurvePoint fromPubKeyEncoded(byte[] encodedPublicKey)
         throws NoSuchAlgorithmException, InvalidKeySpecException {
         return from(CryptoUtils.toPublicEncodedBC(encodedPublicKey, EC_KEY));
     }
 
     public static CurvePoint fromPubKeyEncoded(byte[] encodedPublicKey, CurveSpec pointSpec)
         throws NoSuchAlgorithmException, InvalidKeySpecException {
-        return from(CryptoUtils.toPublicEncodedBC(encodedPublicKey, CryptoConstants.EC_KEY), pointSpec);
         return from(CryptoUtils.toPublicEncodedBC(encodedPublicKey, EC_KEY), pointSpec);
     }
 
     public static CurvePoint fromSignature(byte[] signature, ICurveSpec spec) {

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/curve/CurveSpec.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/curve/CurveSpec.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/curve/EcSignatureAlgorithm.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/curve/EcSignatureAlgorithm.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/ecdh/EcdhKeyPair.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/ecdh/EcdhKeyPair.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/ecdh/EcdhVerifier.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/ecdh/EcdhVerifier.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CertificateEncoderException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CertificateEncoderException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CrlGenerationFailed.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CrlGenerationFailed.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CrlInvalidSignature.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CrlInvalidSignature.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CurveNameMappingException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/CurveNameMappingException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/EcdhKeyPairException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/EcdhKeyPairException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/EncryptionProviderException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/EncryptionProviderException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/HMacProviderException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/HMacProviderException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/InvalidSignatureException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/InvalidSignatureException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/KeystoreGenericException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/KeystoreGenericException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/...toCore/src/main/java/com/intel/bkp/crypto/exceptions/X509CertificateParsingException.java b/...toCore/src/main/java/com/intel/bkp/crypto/exceptions/X509CertificateParsingException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/X509CrlParsingException.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/exceptions/X509CrlParsingException.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/hmac/HMacKdfProviderImpl.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/hmac/HMacKdfProviderImpl.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/hmac/IHMacProvider.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/hmac/IHMacProvider.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/impl/AesUtils.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/impl/AesUtils.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/impl/CertificateUtils.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/impl/CertificateUtils.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/CryptoCore/src/main/java/com/intel/bkp/crypto/impl/EcUtils.java b/CryptoCore/src/main/java/com/intel/bkp/crypto/impl/EcUtils.java
@@ -3,7  3,7 @@
  *
  * **************************************************************************
  *
- * Copyright 2020-2022 Intel Corporation. All Rights Reserved.
  * Copyright 2020-2023 Intel Corporation. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: