diff -r 2230bb152a9f -r 46492a773912 src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java --- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java Fri Jun 22 13:20:55 2018 +0200 +++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java Fri Jun 22 21:42:00 2018 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2018, 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 @@ -105,6 +105,8 @@ return new RSASignature.MD5(); } else if (algo.equals("MD2withRSA")) { return new RSASignature.MD2(); + } else if (algo.equals("RSASSA-PSS")) { + return new RSASignature.PSS(); } } else if (type.equals("KeyPairGenerator")) { if (algo.equals("RSA")) { @@ -178,6 +180,10 @@ new String[] { "1.2.840.113549.1.1.13", "OID.1.2.840.113549.1.1.13" }, attrs)); putService(new ProviderService(p, "Signature", + "RSASSA-PSS", "sun.security.mscapi.RSASignature$PSS", + new String[] { "1.2.840.113549.1.1.10", "OID.1.2.840.113549.1.1.10" }, + attrs)); + putService(new ProviderService(p, "Signature", "MD5withRSA", "sun.security.mscapi.RSASignature$MD5", null, attrs)); putService(new ProviderService(p, "Signature",