git: openjdk/jdk: master: 2 new changesets

Thu Nov 20 15:19:21 UTC 2025

Changeset: 45a2fd37
Branch: master
Author:    Weijun Wang <weijun at openjdk.org>
Date:      2025-11-20 15:15:41 +0000
URL:       https://git.openjdk.org/jdk/commit/45a2fd37f0ebda35789006b4e607422f7c369017

8325448: Hybrid Public Key Encryption

Reviewed-by: mullan, ascarpino, abarashev

! src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
+ src/java.base/share/classes/com/sun/crypto/provider/HPKE.java
! src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+ src/java.base/share/classes/javax/crypto/spec/HPKEParameterSpec.java
+ src/java.base/share/classes/javax/crypto/spec/snippet-files/PackageSnippets.java
+ src/java.base/share/classes/sun/security/util/SliceableSecretKey.java
+ test/jdk/com/sun/crypto/provider/Cipher/HPKE/Compliance.java
+ test/jdk/com/sun/crypto/provider/Cipher/HPKE/Functions.java
+ test/jdk/com/sun/crypto/provider/Cipher/HPKE/KAT9180.java
! test/jdk/com/sun/crypto/provider/DHKEM/Compliance.java
! test/jdk/sun/security/provider/all/Deterministic.java
+ test/jdk/sun/security/util/SliceableSecretKey/SoftSliceable.java

Changeset: a8901858
Branch: master
Author:    Alexey Semenyuk <asemenyuk at openjdk.org>
Date:      2025-11-20 15:17:44 +0000
URL:       https://git.openjdk.org/jdk/commit/a89018582160a9d876f66925618c8b8f93190e67

8333727: Use JOpt in jpackage to parse command line
8371384: libapplauncher.so is copied to a wrong location in two step packaging when --install-dir=/usr

Reviewed-by: almatvee

! src/jdk.internal.opt/share/classes/module-info.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromOptions.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
! src/jdk.jpackage/linux/classes/module-info.java.extra
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBuildEnvFromParams.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
! src/jdk.jpackage/macosx/classes/module-info.java.extra
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromOptions.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionsTransformer.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Packager.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/AdditionalLauncher.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationModifier.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/BundlingOperationOptionScope.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/CliBundlingEnvironment.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/DefaultOptions.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/HelpFormatter.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/I18N.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/MessageFormatUtils.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Option.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionIdentifier.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionName.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionScope.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSource.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValue.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueExceptionFactory.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Options.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardFaOption.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardHelpFormatter.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionContext.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOptionValueExceptionFactory.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StringToken.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifier.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/WithOptionIdentifierStub.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperationDescriptor.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/SetBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
! src/jdk.jpackage/share/classes/module-info.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromOpions.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
! src/jdk.jpackage/windows/classes/module-info.java.extra
! test/jdk/tools/jpackage/TEST.properties
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
! test/jdk/tools/jpackage/junit/TEST.properties
! test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
- test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/LauncherStartupInfoBuilderTest.java
! test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/DefaultOptionsTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ExpectedOptions.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/HelpTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilderTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MockupCliBundlingEnvironment.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionIdentifierTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionNameTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueExceptionFactoryTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsProcessorTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardBundlingOperationTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValidatorTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StringTokenTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/UtilsTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-linux.txt
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-macos.txt
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/help-windows.txt
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/jpackage-options.md
! test/jdk/tools/jpackage/share/AppImagePackageTest.java
+ test/jdk/tools/jpackage/share/AsyncTest.java
! test/jdk/tools/jpackage/share/ErrorTest.java