diff a/test/jdk/java/security/SignedObject/Chain.java b/test/jdk/java/security/SignedObject/Chain.java --- a/test/jdk/java/security/SignedObject/Chain.java +++ b/test/jdk/java/security/SignedObject/Chain.java @@ -1,7 +1,7 @@ -/** - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. +/* + * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. @@ -69,24 +69,39 @@ MD5withRSA("md5withRSA"), SHA1withDSA("SHA1withDSA"), SHA224withDSA("SHA224withDSA"), SHA256withDSA("SHA256withDSA"), + SHA384withDSA("SHA384withDSA"), + SHA512withDSA("SHA512withDSA"), + + SHA3_224withDSA("SHA3-224withDSA"), + SHA3_256withDSA("SHA3-256withDSA"), + SHA3_384withDSA("SHA3-384withDSA"), + SHA3_512withDSA("SHA3-512withDSA"), SHA1withRSA("Sha1withrSA"), SHA224withRSA("SHA224withRSA"), SHA256withRSA("SHA256withRSA"), SHA384withRSA("SHA384withRSA"), SHA512withRSA("SHA512withRSA"), SHA512_224withRSA("SHA512/224withRSA"), SHA512_256withRSA("SHA512/256withRSA"), + SHA3_224withRSA("SHA3-224withRSA"), + SHA3_256withRSA("SHA3-256withRSA"), + SHA3_384withRSA("SHA3-384withRSA"), + SHA3_512withRSA("SHA3-512withRSA"), SHA1withECDSA("SHA1withECDSA"), - SHA256withECDSA("SHA256withECDSA"), SHA224withECDSA("SHA224withECDSA"), + SHA256withECDSA("SHA256withECDSA"), SHA384withECDSA("SHA384withECDSA"), SHA512withECDSA("SHA512withECDSA"), + SHA3_224withECDSA("SHA3-224withECDSA"), + SHA3_256withECDSA("SHA3-256withECDSA"), + SHA3_384withECDSA("SHA3-384withECDSA"), + SHA3_512withECDSA("SHA3-512withECDSA"), MD5andSHA1withRSA("MD5andSHA1withRSA"), RSASSA_PSS("RSASSA-PSS"); @@ -145,11 +160,14 @@ private static final Test[] tests = { new Test(SigAlg.SHA1withDSA, KeyAlg.DSA, Provider.Default, 1024), new Test(SigAlg.MD2withRSA, KeyAlg.RSA, Provider.Default), new Test(SigAlg.MD5withRSA, KeyAlg.RSA, Provider.Default), - new Test(SigAlg.SHA1withRSA, KeyAlg.RSA, Provider.Default), + new Test(SigAlg.SHA3_224withRSA, KeyAlg.RSA, Provider.Default), + new Test(SigAlg.SHA3_256withRSA, KeyAlg.RSA, Provider.Default), + new Test(SigAlg.SHA3_384withRSA, KeyAlg.RSA, Provider.Default), + new Test(SigAlg.SHA3_512withRSA, KeyAlg.RSA, Provider.Default), new Test(SigAlg.SHA1withDSA, KeyAlg.DSA, Provider.Sun, 1024), new Test(SigAlg.SHA224withDSA, KeyAlg.DSA, Provider.Sun, 2048), new Test(SigAlg.SHA256withDSA, KeyAlg.DSA, Provider.Sun, 2048), };