Skip to content

8302017: Allocate BadPaddingException only if it will be thrown #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

8302017: Allocate BadPaddingException only if it will be thrown #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
739f7a2
Backport 334b977259930368160db705c1f2feda0b0e8707
alexeybakhtin Dec 14, 2023
66deb0d
Fix switch statement
alexeybakhtin Dec 14, 2023
2110d9f
Fixed copyright date and engineVerify formating
alexeybakhtin Dec 14, 2023
8e33ae8
Move signature length verification out of try block
alexeybakhtin Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jdk/src/share/classes/sun/security/rsa/RSAPadding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
Expand Down
13 changes: 6 additions & 7 deletions jdk/src/share/classes/sun/security/rsa/RSASignature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,15 @@ protected boolean engineVerify(byte[] sigBytes) throws SignatureException {
if (publicKey == null) {
throw new SignatureException("Missing public key");
}

if (sigBytes.length != RSACore.getByteLength(publicKey)) {
throw new SignatureException("Bad signature length: got " +
try {
if (sigBytes.length != RSACore.getByteLength(publicKey)) {
throw new SignatureException("Bad signature length: got " +
sigBytes.length + " but was expecting " +
RSACore.getByteLength(publicKey));
}
}

// https://www.rfc-editor.org/rfc/rfc8017.html#section-8.2.2
// Step 4 suggests comparing the encoded message
try {
// https://www.rfc-editor.org/rfc/rfc8017.html#section-8.2.2
// Step 4 suggests comparing the encoded message
byte[] decrypted = RSACore.rsa(sigBytes, publicKey);

byte[] digest = getDigestValue();
Expand Down