From be721ea54cab26061b02b234d6365aa66ea4a7bd Mon Sep 17 00:00:00 2001
From: valeriep <unknown>
Date: Tue, 1 Jul 2014 20:35:30 +0000
Subject: [PATCH] 8046046: Test
 sun/security/pkcs11/Signature/TestDSAKeyLength.java fails intermittently on
 Solaris 11 in 8u40 nightly Summary: Override the upper limit to 1024 for
 SHA1withDSA when larger DSA key size is supported. Reviewed-by: mullan,
 ascarpino

---
 src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/share/classes/sun/security/pkcs11/P11Signature.java b/src/share/classes/sun/security/pkcs11/P11Signature.java
index 4a0733d71..1bac22ca6 100644
--- a/src/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/share/classes/sun/security/pkcs11/P11Signature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -340,7 +340,10 @@ final class P11Signature extends SignatureSpi {
         }
         int minKeySize = (int) mechInfo.ulMinKeySize;
         int maxKeySize = (int) mechInfo.ulMaxKeySize;
-
+        // need to override the MAX keysize for SHA1withDSA
+        if (md != null && mechanism == CKM_DSA && maxKeySize > 1024) {
+               maxKeySize = 1024;
+        }
         int keySize = 0;
         if (key instanceof P11Key) {
             keySize = ((P11Key) key).length();
-- 
GitLab