[Cryptix-commits] projects/openpgp/src/cryptix/openpgp/provider PGPEncryptedMessageBuilder.java

[<ed...@bo...>]

edwin       03/08/22 21:50:43

  Modified:    openpgp/src/cryptix/openpgp/provider
                        PGPEncryptedMessageBuilder.java
  Log:
  Better params checking.

Revision  Changes    Path
1.4       +11 -2     projects/openpgp/src/cryptix/openpgp/provider/PGPEncryptedMessageBuilder.java

Index: PGPEncryptedMessageBuilder.java
===================================================================
RCS file: /home/cryptix-cvs/cvsroot/projects/openpgp/src/cryptix/openpgp/provider/PGPEncryptedMessageBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PGPEncryptedMessageBuilder.java	31 Jan 2003 00:55:14 -0000	1.3
+++ PGPEncryptedMessageBuilder.java	23 Aug 2003 01:50:43 -0000	1.4
@@ -1,4 +1,4 @@
-/* $Id: PGPEncryptedMessageBuilder.java,v 1.3 2003/01/31 00:55:14 edwin Exp $
+/* $Id: PGPEncryptedMessageBuilder.java,v 1.4 2003/08/23 01:50:43 edwin Exp $
  *
  * Copyright (C) 2001 The Cryptix Foundation Limited.
  * All rights reserved.
@@ -56,7 +56,7 @@
  * Service provider interface for EncryptedMessageBuilder
  *
  * @author Edwin Woudt <ed...@cr...>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
 public class PGPEncryptedMessageBuilder extends EncryptedMessageBuilderSpi {
 
@@ -76,6 +76,15 @@
     public void engineInit(Message contents, SecureRandom sr)
         throws IllegalStateException, MessageException
     {
+        if (! ((contents instanceof PGPLiteralMessageImpl) || 
+               (contents instanceof PGPSignedMessageImpl)))
+        {
+            throw new MessageException("Can only encrypt OpenPGP literal or "+
+                "signed messages");
+        }
+        if (this.contents != null) {
+            throw new IllegalStateException("Already initialized");
+        }
         this.contents = contents;
         this.sr = sr;
     }