--- a/jdk/src/java.base/share/classes/java/security/Signature.java Thu Sep 25 13:03:27 2014 +0200
+++ b/jdk/src/java.base/share/classes/java/security/Signature.java Thu Sep 25 12:24:19 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -121,6 +121,11 @@
private static final Debug debug =
Debug.getInstance("jca", "Signature");
+ private static final Debug pdebug =
+ Debug.getInstance("provider", "Provider");
+ private static final boolean skipDebug =
+ Debug.isOn("engine=") && !Debug.isOn("signature");
+
/*
* The algorithm for this signature object.
* This value is used to map an OID to the particular algorithm.
@@ -451,6 +456,11 @@
throws InvalidKeyException {
engineInitVerify(publicKey);
state = VERIFY;
+
+ if (!skipDebug && pdebug != null) {
+ pdebug.println("Signature." + algorithm +
+ " verification algorithm from: " + this.provider.getName());
+ }
}
/**
@@ -495,6 +505,11 @@
PublicKey publicKey = certificate.getPublicKey();
engineInitVerify(publicKey);
state = VERIFY;
+
+ if (!skipDebug && pdebug != null) {
+ pdebug.println("Signature." + algorithm +
+ " verification algorithm from: " + this.provider.getName());
+ }
}
/**
@@ -511,6 +526,11 @@
throws InvalidKeyException {
engineInitSign(privateKey);
state = SIGN;
+
+ if (!skipDebug && pdebug != null) {
+ pdebug.println("Signature." + algorithm +
+ " signing algorithm from: " + this.provider.getName());
+ }
}
/**
@@ -529,6 +549,11 @@
throws InvalidKeyException {
engineInitSign(privateKey, random);
state = SIGN;
+
+ if (!skipDebug && pdebug != null) {
+ pdebug.println("Signature." + algorithm +
+ " signing algorithm from: " + this.provider.getName());
+ }
}
/**