For now, no support for OpenPGP CFB sync or for CBC MACs, so the

enable_sync and cbc_mac flags are removed.

README.rst

@@ -38,7 +38,7 @@ Privacy Guard cryptographic suite (GnuPG or GPG).
 CONTENTS
 ========
 
-* symmetric(ENUM {AES,AES128,RIJNDAEL,RIJNDAEL128,AES192,RIJNDAEL192,AES256,RIJNDAEL256}, ENUM {ECB,CFB,CBC,OFB,CTR}, ENUM {PKCS7,ISO7816,X923,NONE}, BLOB, BOOL, BOOL, BOOL, BOOL)
+* symmetric(ENUM {AES,AES128,RIJNDAEL,RIJNDAEL128,AES192,RIJNDAEL192,AES256,RIJNDAEL256}, ENUM {ECB,CFB,CBC,OFB,CTR}, ENUM {PKCS7,ISO7816,X923,NONE}, BLOB, BOOL, BOOL)
 * STRING version()
 * STRING gcrypt_version()
 
@@ -49,7 +49,7 @@ symmetric
 
 ::
 
-	new OBJ = symmetric(ENUM {AES,AES128,RIJNDAEL,RIJNDAEL128,AES192,RIJNDAEL192,AES256,RIJNDAEL256} cipher, ENUM {ECB,CFB,CBC,OFB,CTR} mode, ENUM {PKCS7,ISO7816,X923,NONE} padding="PKCS7", BLOB key, BOOL secure=1, BOOL enable_sync=0, BOOL cbc_cts=0, BOOL cbc_mac=0)
+	new OBJ = symmetric(ENUM {AES,AES128,RIJNDAEL,RIJNDAEL128,AES192,RIJNDAEL192,AES256,RIJNDAEL256} cipher, ENUM {ECB,CFB,CBC,OFB,CTR} mode, ENUM {PKCS7,ISO7816,X923,NONE} padding="PKCS7", BLOB key, BOOL secure=1, BOOL cbc_cts=0)
 
 .. _func_symmetric.encrypt:
 

src/vmod_gcrypt.c

@@ -189,7 +189,7 @@ VCL_VOID
 vmod_symmetric__init(VRT_CTX, struct vmod_gcrypt_symmetric **symmetricp,
 		     const char *vcl_name, VCL_ENUM ciphers, VCL_ENUM modes,
 		     VCL_ENUM paddings, VCL_BLOB key, VCL_BOOL secure,
-		     VCL_BOOL enable_sync, VCL_BOOL cbc_cts, VCL_BOOL cbc_mac)
+		     VCL_BOOL cbc_cts)
 {
 	struct vmod_gcrypt_symmetric *symmetric;
 	gcry_cipher_hd_t hd;
@@ -250,12 +250,8 @@ vmod_symmetric__init(VRT_CTX, struct vmod_gcrypt_symmetric **symmetricp,
 
 	if (secure)
 		flags |= GCRY_CIPHER_SECURE;
-	if (enable_sync)
-		flags |= GCRY_CIPHER_ENABLE_SYNC;
 	if (cbc_cts)
 		flags |= GCRY_CIPHER_CBC_CTS;
-	if (cbc_mac)
-		flags |= GCRY_CIPHER_CBC_MAC;
 
 	if ((err = gcry_cipher_open(&hd, algo, mode, flags))
 	    != GPG_ERR_NO_ERROR) {

src/vmod_gcrypt.vcc

@@ -21,8 +21,7 @@ Privacy Guard cryptographic suite (GnuPG or GPG).
 $Object symmetric(ENUM {AES, AES128, RIJNDAEL, RIJNDAEL128, AES192, RIJNDAEL192,
                   AES256, RIJNDAEL256} cipher, ENUM {ECB, CFB, CBC, OFB, CTR}
 		  mode, ENUM {PKCS7, ISO7816, X923, NONE} padding="PKCS7",
-		  BLOB key, BOOL secure=1, BOOL enable_sync=0, BOOL cbc_cts=0,
-		  BOOL cbc_mac=0)
+		  BLOB key, BOOL secure=1, BOOL cbc_cts=0)
 
 $Method BLOB .encrypt(BLOB plaintext, BLOB iv=0, BLOB ctr=0)