From f04a1db22d982627ba87da4e5df52df9b994c779 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 2 Oct 2013 14:14:57 +0200 Subject: Remove deprecated control codes. * src/gcrypt.h.in (GCRYCTL_SET_KEY): Remove. (GCRYCTL_SET_IV): Remove. (GCRYCTL_SET_CTR): Remove. * cipher/md.c (gcry_md_ctl): Remove deprecated GCRYCTL_SET_KEY. * cipher/cipher.c (gcry_cipher_ctl): Remove deprecated GCRYCTL_SET_KEY, GCRYCTL_SET_IV, GCRYCTL_SET_CTR. -- Real functions are available for a long time now thus there is no more point in supporting the control code hacks. We have an ABI break anyway thus this is a good time to get rid of them. Signed-off-by: Werner Koch --- cipher/cipher.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'cipher/cipher.c') diff --git a/cipher/cipher.c b/cipher/cipher.c index ca61375a..75d42d14 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -918,14 +918,6 @@ gcry_cipher_ctl( gcry_cipher_hd_t h, int cmd, void *buffer, size_t buflen) switch (cmd) { - case GCRYCTL_SET_KEY: /* Deprecated; use gcry_cipher_setkey. */ - rc = cipher_setkey( h, buffer, buflen ); - break; - - case GCRYCTL_SET_IV: /* Deprecated; use gcry_cipher_setiv. */ - cipher_setiv( h, buffer, buflen ); - break; - case GCRYCTL_RESET: cipher_reset (h); break; @@ -962,10 +954,6 @@ gcry_cipher_ctl( gcry_cipher_hd_t h, int cmd, void *buffer, size_t buflen) disable_cipher_algo( *(int*)buffer ); break; - case GCRYCTL_SET_CTR: /* Deprecated; use gcry_cipher_setctr. */ - rc = gpg_err_code (_gcry_cipher_setctr (h, buffer, buflen)); - break; - case 61: /* Disable weak key detection (private). */ if (h->spec->set_extra_info) rc = h->spec->set_extra_info -- cgit v1.2.1