Merge pull request #344 from adorsys/gcm-cipher-cannot-be-reused-for-…

…encryption

Fix: ensure unique iv generation for GCM encryption to prevent reuse error

datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java

@@ -30,6 +30,7 @@
 import java.io.OutputStream;
 import java.security.Key;
 import java.security.KeyPair;
+import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -47,10 +48,12 @@
 public class CMSEncryptionServiceImpl implements CMSEncryptionService {
 
  private ASNCmsEncryptionConfig encryptionConfig;
+ private SecureRandom secureRandom;
 
  @Inject
  public CMSEncryptionServiceImpl(ASNCmsEncryptionConfig encryptionConfig) {
  this.encryptionConfig = encryptionConfig;
+ this.secureRandom = new SecureRandom();
  }
 
  /**
@@ -145,7 +148,7 @@ private OutputStream streamEncrypt(OutputStream dataContentStream, Set<Recipient
 
  return generator.open(
  dataContentStream,
- new JceCMSContentEncryptorBuilder(algorithm).setProvider(GeneratorModule_ProviderFactory.provider()).build()
+ new JceCMSContentEncryptorBuilder(algorithm).setProvider(GeneratorModule_ProviderFactory.provider()).setSecureRandom( this.secureRandom).build()
  );
  }
 }