Index: trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java =================================================================== --- trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java (revision 431782) +++ trunk/modules/crypto/src/main/java/javax/crypto/Cipher.java (working copy) @@ -40,6 +40,7 @@ import java.util.StringTokenizer; import org.apache.harmony.security.fortress.Engine; +import org.apache.harmony.crypto.internal.NullCipherSpi; /** @@ -125,6 +126,12 @@ */ protected Cipher(CipherSpi cipherSpi, Provider provider, String transformation) { + if (cipherSpi == null) { + throw new NullPointerException(); + } + if (!(cipherSpi instanceof NullCipherSpi) && provider == null) { + throw new NullPointerException(); + } this.provider = provider; this.transformation = transformation; this.spiImpl = cipherSpi;