xnu-6153.81.5.tar.gz

[apple/xnu.git] / libkern / crypto / corecrypto_des.c

diff --git a/libkern/crypto/corecrypto_des.c b/libkern/crypto/corecrypto_des.c
index e916b520bfd4457944431846fa4f26b72400fc4c..b77967c491906c2118cac65329477412ec545536 100644 (file)
--- a/libkern/crypto/corecrypto_des.c
+++ b/libkern/crypto/corecrypto_des.c
@@ -34,62 +34,70 @@
 #include <corecrypto/ccmode.h>
 
 /* Single DES ECB - used by ipv6 (esp_core.c) */
-int des_ecb_key_sched(des_cblock *key, des_ecb_key_schedule *ks)
+int
+des_ecb_key_sched(des_cblock *key, des_ecb_key_schedule *ks)
 {
        const struct ccmode_ecb *enc = g_crypto_funcs->ccdes_ecb_encrypt;
        const struct ccmode_ecb *dec = g_crypto_funcs->ccdes_ecb_decrypt;
 
-        /* Make sure the context size for the mode fits in the one we have */
-        if((enc->size>sizeof(ks->enc)) || (dec->size>sizeof(ks->dec)))
-                panic("%s: inconsistent size for DES-ECB context", __FUNCTION__);
- 
-       enc->init(enc, ks->enc, CCDES_KEY_SIZE, key);
-       dec->init(dec, ks->dec, CCDES_KEY_SIZE, key);
+       /* Make sure the context size for the mode fits in the one we have */
+       if ((enc->size > sizeof(ks->enc)) || (dec->size > sizeof(ks->dec))) {
+               panic("%s: inconsistent size for DES-ECB context", __FUNCTION__);
+       }
 
-       /* The old DES interface could return -1 or -2 for weak keys and wrong parity,
-        but this was disabled all the time, so we never fail here */
-       return 0;
+       int rc = enc->init(enc, ks->enc, CCDES_KEY_SIZE, key);
+       if (rc) {
+               return rc;
+       }
+
+       return dec->init(dec, ks->dec, CCDES_KEY_SIZE, key);
 }
 
 /* Simple des - 1 block */
-void des_ecb_encrypt(des_cblock *in, des_cblock *out, des_ecb_key_schedule *ks, int enc)
+int
+des_ecb_encrypt(des_cblock *in, des_cblock *out, des_ecb_key_schedule *ks, int enc)
 {
        const struct ccmode_ecb *ecb = enc ? g_crypto_funcs->ccdes_ecb_encrypt : g_crypto_funcs->ccdes_ecb_decrypt;
        ccecb_ctx *ctx = enc ? ks->enc : ks->dec;
 
-       ecb->ecb(ctx, 1, in, out);
+       return ecb->ecb(ctx, 1, in, out);
 }
 
 
 /* Triple DES ECB - used by ipv6 (esp_core.c) */
-int des3_ecb_key_sched(des_cblock *key, des3_ecb_key_schedule *ks)
+int
+des3_ecb_key_sched(des_cblock *key, des3_ecb_key_schedule *ks)
 {
-       int rc;
        const struct ccmode_ecb *enc = g_crypto_funcs->cctdes_ecb_encrypt;
        const struct ccmode_ecb *dec = g_crypto_funcs->cctdes_ecb_decrypt;
 
-        /* Make sure the context size for the mode fits in the one we have */
-        if((enc->size>sizeof(ks->enc)) || (dec->size>sizeof(ks->dec)))
-                panic("%s: inconsistent size for 3DES-ECB context", __FUNCTION__);
- 
-       rc = enc->init(enc, ks->enc, CCDES_KEY_SIZE*3, key);
-       rc |= dec->init(dec, ks->dec, CCDES_KEY_SIZE*3, key);
+       /* Make sure the context size for the mode fits in the one we have */
+       if ((enc->size > sizeof(ks->enc)) || (dec->size > sizeof(ks->dec))) {
+               panic("%s: inconsistent size for 3DES-ECB context", __FUNCTION__);
+       }
+
+       int rc = enc->init(enc, ks->enc, CCDES_KEY_SIZE * 3, key);
+       if (rc) {
+               return rc;
+       }
 
-       return rc;
+       return dec->init(dec, ks->dec, CCDES_KEY_SIZE * 3, key);
 }
 
 /* Simple des - 1 block */
-void des3_ecb_encrypt(des_cblock *in, des_cblock *out, des3_ecb_key_schedule *ks, int enc)
+int
+des3_ecb_encrypt(des_cblock *in, des_cblock *out, des3_ecb_key_schedule *ks, int enc)
 {
        const struct ccmode_ecb *ecb = enc ? g_crypto_funcs->cctdes_ecb_encrypt : g_crypto_funcs->cctdes_ecb_decrypt;
        ccecb_ctx *ctx = enc ? ks->enc : ks->dec;
 
-       ecb->ecb(ctx, 1, in, out);
+       return ecb->ecb(ctx, 1, in, out);
 }
 
 /* Raw key helper functions */
 
-int des_is_weak_key(des_cblock *key)
+int
+des_is_weak_key(des_cblock *key)
 {
        return g_crypto_funcs->ccdes_key_is_weak_fn(key, CCDES_KEY_SIZE);
 }