[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml: common/impl/SecureRandomIdentifierGene...

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Sep 16 12:40:47 2011
New Revision: 2886

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2886&view=rev
Log:
Remove exception from no-arg constructor on SecureRandomIdentifierGenerator, turn it in to a runtime exception

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java?rev=2886&r1=2885&r2=2886&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/common/impl/SecureRandomIdentifierGenerator.java Fri Sep 16 12:40:47 2011
@@ -36,8 +36,12 @@
      * 
      * @throws NoSuchAlgorithmException thrown if the SHA1PRNG algorithm is not supported by the JVM
      */
-    public SecureRandomIdentifierGenerator() throws NoSuchAlgorithmException {
-        random = SecureRandom.getInstance("SHA1PRNG");
+    public SecureRandomIdentifierGenerator() {
+        try {
+            random = SecureRandom.getInstance("SHA1PRNG");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("SHA1PRNG is required to be supported by the JVM but is not", e);
+        }
     }
 
     /**

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java?rev=2886&r1=2885&r2=2886&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/encryption/Encrypter.java Fri Sep 16 12:40:47 2011
@@ -211,11 +211,7 @@
         carriedKeyNameBuilder = 
             (XMLEncryptionBuilder<CarriedKeyName>) builderFactory.getBuilder(CarriedKeyName.DEFAULT_ELEMENT_NAME);
         
-        try{
-            idGenerator = new SecureRandomIdentifierGenerator();
-        }catch(NoSuchAlgorithmException e){
-            log.error("JVM does not support SHA1PRNG random number generation algorithm.");
-        }
+        idGenerator = new SecureRandomIdentifierGenerator();
         
         keyPlacement = KeyPlacement.PEER;
     }