Don't re-wrap CMSException in JceKeyAgreeRecipient

A CMSException raised while recovering the session key now reaches the
caller as is, rather than wrapped as "originator key invalid.", e.g. the
unsupported originator identifier case.

Author: peterdettman

pkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipient.java

@@ -370,6 +370,10 @@ protected Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, Algor
         {
             throw new CMSException("required padding not supported.", e);
         }
+        catch (CMSException e)
+        {
+            throw e;
+        }
         catch (Exception e)
         {
             throw new CMSException("originator key invalid.", e);

pkix/src/main/jdk1.1/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipient.java

@@ -301,6 +301,10 @@ protected Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, Algor
         {
             throw new CMSException("required padding not supported.", e);
         }
+        catch (CMSException e)
+        {
+            throw e;
+        }
         catch (Exception e)
         {
             throw new CMSException("originator key invalid.", e);