On Fri, 13 Jan 2006, Kazunori Miyazawa wrote:

+#ifdef CONFIG_CRYPTO_XCBC
+       mode = aalg_desc->desc.sadb_alg_id == SADB_X_AALG_AES_XCBC_MAC ?
+               CRYPTO_TFM_MODE_CBC : 0;
+#endif
+
        ahp->key = x->aalg->alg_key;
        ahp->key_len = (x->aalg->alg_key_len+7)/8;
-       ahp->tfm = crypto_alloc_tfm(x->aalg->alg_name, 0);
+       ahp->tfm = crypto_alloc_tfm(x->aalg->alg_name, mode);
        if (!ahp->tfm)
                goto error;
+#ifdef CONFIG_CRYPTO_XCBC
+       ahp->icv = !mode ? ah_hmac_digest : ah_xcbc_digest;
+#else
        ahp->icv = ah_hmac_digest;
-       
+#endif


Once again, these #ifdefs need to disappear from the core code.

Please send patches inline.



- James
-- 
James Morris
<[EMAIL PROTECTED]>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to