Add functions des_set_key_checked, des_set_key_unchecked.

[openssl.git] / crypto / evp / e_ecb_d.c

diff --git a/crypto/evp/e_ecb_d.c b/crypto/evp/e_ecb_d.c
index b1b80e61dd02749360303f060d3c4c6cc31ab0ae..c11bef55efc1213de5e11f51c7acb31934ae5df1 100644 (file)
--- a/crypto/evp/e_ecb_d.c
+++ b/crypto/evp/e_ecb_d.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_ecb_d.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,58 +56,63 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DES
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void des_ecb_init_key();
-static void des_ecb_cipher();
-#endif
-
 static EVP_CIPHER d_ecb_cipher=
        {
        NID_des_ecb,
        8,8,0,
        des_ecb_init_key,
        des_ecb_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
+       NULL,
+       NULL,
        };
 
-EVP_CIPHER *EVP_des_ecb()
+EVP_CIPHER *EVP_des_ecb(void)
        {
        return(&d_ecb_cipher);
        }
        
-static void des_ecb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
-       if (key != NULL)
-               des_set_key((des_cblock *)key,ctx->c.des_ecb.ks);
+       des_cblock *deskey = (des_cblock *)key;
+
+       if (deskey != NULL)
+               des_set_key_unchecked(deskey,ctx->c.des_ks);
        }
 
-static void des_ecb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        unsigned int i;
+       des_cblock *output  /* = (des_cblock *)out */;
+       des_cblock *input   /* = (des_cblock *)in */; 
 
        if (inl < 8) return;
        inl-=8;
        for (i=0; i<=inl; i+=8)
                {
-               des_ecb_encrypt(
-                       (des_cblock *)&(in[i]),(des_cblock *)&(out[i]),
-                       ctx->c.des_ecb.ks,ctx->encrypt);
+               /* Either this ... */
+               output = (des_cblock *)(out + i);
+               input = (des_cblock *)(in + i);
+
+               des_ecb_encrypt(input,output,ctx->c.des_ks,ctx->encrypt);
+
+               /* ... or this. */
+               /* output++; */
+               /* input++; */
                }
        }
+#endif