casa-mp-base

Fix build failure with libgcrypt 1.6

https://rt.cpan.org/Public/Bug/Display.html?id=97201

--- GCrypt.xs.orig  2011-05-27 22:04:03.000000000 +0200

+++ GCrypt.xs   2014-07-27 16:14:05.000000000 +0200

@@ -56,9 +56,13 @@

     int type;

     int action;

     gcry_cipher_hd_t h;

+/*

     gcry_ac_handle_t h_ac;

+*/

     gcry_md_hd_t h_md;

+/*

     gcry_ac_key_t key_ac;

+*/

     gcry_error_t err;

     int mode;

     int padding;

@@ -203,7 +207,9 @@

         char *s, *algo_s, *mode_s, *key_s;

         int i, algo, mode;

         unsigned int c_flags, ac_flags, md_flags;

+/*

         gcry_ac_id_t ac_algo;

+*/

         bool have_mode;

     CODE:

         New(0, RETVAL, 1, struct Crypt_GCrypt_s);

@@ -322,25 +328,19 @@

             if (!(algo = gcry_md_map_name(algo_s)))

                 croak("Unknown digest algorithm %s", algo_s);

-        RETVAL->err = gcry_md_open(&RETVAL->h_md, algo, md_flags);

+            RETVAL->err = gcry_md_open(&RETVAL->h_md, algo, md_flags);

             if (RETVAL->h_md == NULL) XSRETURN_UNDEF;

-        if (md_flags & GCRY_MD_FLAG_HMAC) {

-            /* what if this overwrites the earlier error value? */

-            RETVAL->err = gcry_md_setkey(RETVAL->h_md, key_s, RETVAL->keylen);

+            if (md_flags & GCRY_MD_FLAG_HMAC) {

+                /* what if this overwrites the earlier error value? */

+                RETVAL->err = gcry_md_setkey(RETVAL->h_md, key_s, RETVAL->keylen);

+            }

         }

-    }

         if (RETVAL->type == CG_TYPE_ASYMM) {

             croak("Asymmetric cryptography is not yet supported by Crypt::GCrypt");

+       XSRETURN_UNDEF;

-            RETVAL->err = gcry_ac_name_to_id(algo_s, &ac_algo);

-            if (RETVAL->err)

-                croak("Unknown algorithm %s", algo_s);

-            

-            /* Init ac */

-            RETVAL->err = gcry_ac_open(&RETVAL->h_ac, ac_algo, ac_flags);

-            if (RETVAL->h_ac == NULL) XSRETURN_UNDEF;

         }

@@ -532,39 +532,6 @@

     OUTPUT:

         RETVAL