Skip to content
Permalink
Browse files
8026976: ECParameters, Point does not match field size
Reviewed-by: xuelei
  • Loading branch information
Anthony Scarpino committed Dec 3, 2020
1 parent d3f3c32 commit 55f5542ca2104df91e14693534cc7b3c36e81953
Showing with 8 additions and 3 deletions.
  1. +8 −2 src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11ECKeyFactory.java
  2. +0 −1 test/jdk/ProblemList.txt
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 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
@@ -294,7 +294,13 @@ private PrivateKey generatePrivate(BigInteger s, ECParameterSpec params)
try {
token.p11.C_GetAttributeValue(session[0].id(), keyID, attributes);
ECParameterSpec params = decodeParameters(attributes[1].getByteArray());
ECPoint point = decodePoint(attributes[0].getByteArray(), params.getCurve());
ECPoint point;

if (!token.config.getUseEcX963Encoding()) {
point = decodePoint(new DerValue(attributes[0].getByteArray()).getOctetString(), params.getCurve());
} else {
point = decodePoint(attributes[0].getByteArray(), params.getCurve());
}
return keySpec.cast(new ECPublicKeySpec(point, params));
} catch (IOException e) {
throw new InvalidKeySpecException("Could not parse key", e);
@@ -661,7 +661,6 @@ com/sun/nio/sctp/SctpChannel/SocketOptionTests.java 8141694 linux-al

# jdk_security

sun/security/pkcs11/ec/TestKeyFactory.java 8026976 generic-all
sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8161536 generic-all

sun/security/tools/keytool/ListKeychainStore.sh 8156889 macosx-all

1 comment on commit 55f5542

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 55f5542 Dec 3, 2020

Please sign in to comment.