(MINOR-BC) update: Replace deprecated constructors with static instan…

…tiation calls

BouncyCastle/src/AESEngine.crysl

@@ -1,10 +1,10 @@
 SPEC org.bouncycastle.crypto.engines.AESEngine
 
-OBJECTS
-	int dummy; //This section can't be empty or else the rule is marked with an error.
+FORBIDDEN
+	AESEngine();
 
 EVENTS
-	c1: AESEngine();
+	c1: newInstance();
 	Con := c1;
 
 ORDER

BouncyCastle/src/BufferedBlockCipher.crysl

@@ -1,49 +1,5 @@
+// Deprecated
 SPEC org.bouncycastle.crypto.BufferedBlockCipher
 
-OBJECTS
-	org.bouncycastle.crypto.BlockCipher cipher;
-	org.bouncycastle.crypto.CipherParameters params;
-
-	byte plainTextByte;
-	byte[] plainText;
-	int plainTextOffset;
-	int plainTextLen;
-
-	byte[] cipherText;
-	int cipherTextOffset;
-
-	boolean isEncryption;
-
-
-EVENTS
-	c1: BufferedBlockCipher(cipher);
-	Con := c1;
-
-	i1: init(isEncryption, params);
-	Init := i1;
-
-//	@return the number of output bytes copied to out.
-	p1: processByte(plainTextByte, cipherText, cipherTextOffset);
-	p2: processBytes(plainText, plainTextOffset, plainTextLen, cipherText, cipherTextOffset);
-	Proc := p1 | p2;
-
-//	@return the number of output bytes copied to out.
-	df1: doFinal(cipherText, cipherTextOffset);
-	DoFinal := df1;
-
-ORDER
-	Con, (Init, Proc, DoFinal)+
-
-CONSTRAINTS
-	length[plainText] >= plainTextOffset + plainTextLen;
-	length[cipherText] >= cipherTextOffset;
-	plainTextOffset >= 0;
-	plainTextLen > 0;
-	cipherTextOffset >= 0;
-
-REQUIRES
-	generatedGCMBlockCipher[cipher];
-	generatedCipherParams[params];
-
-ENSURES
-	encrypted[cipherText];
+FORBIDDEN
+	BufferedBlockCipher(org.bouncycastle.crypto.BlockCipher);

BouncyCastle/src/CBCBlockCipher.crysl

@@ -2,12 +2,15 @@ SPEC org.bouncycastle.crypto.modes.CBCBlockCipher
 
 OBJECTS
 	org.bouncycastle.crypto.BlockCipher engine;
+
+FORBIDDEN
+	CBCBlockCipher(org.bouncycastle.crypto.BlockCipher);
 
 EVENTS
-	c1: CBCBlockCipher(engine);
+	c1: newInstance(engine);
 	Con := c1;
 
-//No need to specify the order, must be wrapped in PaddedBufferedCipher!
+// No need to specify the order, must be wrapped in PaddedBufferedCipher!
 ORDER
 	Con
 

BouncyCastle/src/CCMBlockCipher.crysl

@@ -18,9 +18,12 @@ OBJECTS
 	int cipherTextOffset;
 
 	boolean isEncryption;
+
+FORBIDDEN
+	CCMBlockCipher(org.bouncycastle.crypto.BlockCipher);
 
 EVENTS
-	c1: CCMBlockCipher(engine);
+	c1: newInstance(engine);
 	Con := c1;
 
 	i1: init(isEncryption, params);

BouncyCastle/src/DefaultBufferedBlockCipher.crysl

@@ -0,0 +1,48 @@
+SPEC org.bouncycastle.crypto.DefaultBufferedBlockCipher
+
+OBJECTS
+	org.bouncycastle.crypto.BlockCipher cipher;
+	org.bouncycastle.crypto.CipherParameters params;
+
+	byte plainTextByte;
+	byte[] plainText;
+	int plainTextOffset;
+	int plainTextLen;
+
+	byte[] cipherText;
+	int cipherTextOffset;
+
+	boolean isEncryption;
+
+EVENTS
+	c1: DefaultBufferedBlockCipher(cipher);
+	Con := c1;
+
+	i1: init(isEncryption, params);
+	Init := i1;
+
+//	@return the number of output bytes copied to out.
+	p1: processByte(plainTextByte, cipherText, cipherTextOffset);
+	p2: processBytes(plainText, plainTextOffset, plainTextLen, cipherText, cipherTextOffset);
+	Proc := p1 | p2;
+
+//	@return the number of output bytes copied to out.
+	df1: doFinal(cipherText, cipherTextOffset);
+	DoFinal := df1;
+
+ORDER
+	Con, (Init, Proc, DoFinal)+
+
+CONSTRAINTS
+	length[plainText] >= plainTextOffset + plainTextLen;
+	length[cipherText] >= cipherTextOffset;
+	plainTextOffset >= 0;
+	plainTextLen > 0;
+	cipherTextOffset >= 0;
+
+REQUIRES
+	generatedGCMBlockCipher[cipher];
+	generatedCipherParams[params];
+
+ENSURES
+	encrypted[cipherText];

BouncyCastle/src/GCMBlockCipher.crysl

@@ -18,9 +18,12 @@ OBJECTS
 	int cipherTextOffset;
 
 	boolean isEncryption;
+
+FORBIDDEN
+	GCMBlockCipher(org.bouncycastle.crypto.BlockCipher);
 
 EVENTS
-	c1: GCMBlockCipher(engine);
+	c1: newInstance(engine);
 	Con := c1;
 
 	i1: init(isEncryption, params);

BouncyCastle/src/SICBlockCipher.crysl

@@ -1,15 +1,16 @@
 SPEC org.bouncycastle.crypto.modes.SICBlockCipher
 
 OBJECTS
-
 	org.bouncycastle.crypto.BlockCipher engine;
+
+FORBIDDEN
+	SICBlockCipher(org.bouncycastle.crypto.BlockCipher);
 
 EVENTS
-	c1: SICBlockCipher(engine);
+	c1: newInstance(engine);
 	Con := c1;
 
-//No need to specify the order, must be wrapped in BufferedCipher
-
+// No need to specify the order, must be wrapped in BufferedCipher
 ORDER
 	Con