stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8300399: EdDSA does not verify when there is no message

Browse Source 
Reviewed-by: ascarpino
This commit is contained in:
Weijun Wang 2023-01-19 18:32:08 +00:00
parent d85243f02b
commit b317658d69
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.crypto.ec/share/classes/sun/security/ec/ed/EdDSASignature.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023, 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
@ -210,9 +210,7 @@ public class EdDSASignature extends SignatureSpi {
if (publicKeyBytes == null) {
throw new SignatureException("Missing publicKey");
}
if (message == null) {
return false;
}
ensureMessageInit();
boolean result = ops.verify(this.sigParams, this.publicKeyPoint,
this.publicKeyBytes, message.getMessage(), sigBytes);
message = null;

50
test/jdk/sun/security/ec/ed/EmptyMessage.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2023, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8300399
* @summary EdDSA does not verify when there is no message
* @run main EmptyMessage
*/
import java.security.KeyPairGenerator;
import java.security.Signature;
import java.security.spec.NamedParameterSpec;
public class EmptyMessage {
public static void main(String[] args) throws Exception {
var g = KeyPairGenerator.getInstance("EdDSA");
g.initialize(NamedParameterSpec.ED25519);
var kp = g.generateKeyPair();
var ss = Signature.getInstance("EdDSA");
ss.initSign(kp.getPrivate());
var sig = ss.sign();
var ps = Signature.getInstance("EdDSA");
ps.initVerify(kp.getPublic());
if (!ps.verify(sig)) {
throw new RuntimeException();
}
}
}