Massive constification.

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

diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c
index 2e3f85598b078d34f102bbab18a66646d319dc7b..57d46129b615566398c4d4439d3b5605974fe183 100644 (file)
--- a/crypto/evp/e_cbc_r2.c
+++ b/crypto/evp/e_cbc_r2.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_cbc_r2.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
@@ -68,23 +68,78 @@ static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void rc2_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
+static int rc2_meth_to_magic(const EVP_CIPHER *e);
+static EVP_CIPHER *rc2_magic_to_meth(int i);
+static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
+static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
+
 #else
+
 static void rc2_cbc_init_key();
 static void rc2_cbc_cipher();
+static int rc2_meth_to_magic();
+static EVP_CIPHER *rc2_magic_to_meth();
+static int rc2_set_asn1_type_and_iv();
+static int rc2_get_asn1_type_and_iv();
 #endif
 
+#define RC2_40_MAGIC   0xa0
+#define RC2_64_MAGIC   0x78
+#define RC2_128_MAGIC  0x3a
+
 static EVP_CIPHER r2_cbc_cipher=
        {
        NID_rc2_cbc,
        8,EVP_RC2_KEY_SIZE,8,
        rc2_cbc_init_key,
        rc2_cbc_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+       rc2_set_asn1_type_and_iv,
+       rc2_get_asn1_type_and_iv,
+       };
+
+static EVP_CIPHER r2_64_cbc_cipher=
+       {
+       NID_rc2_40_cbc,
+       8,8 /* 64 bit */,8,
+       rc2_cbc_init_key,
+       rc2_cbc_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+       rc2_set_asn1_type_and_iv,
+       rc2_get_asn1_type_and_iv,
+       };
+
+static EVP_CIPHER r2_40_cbc_cipher=
+       {
+       NID_rc2_40_cbc,
+       8,5 /* 40 bit */,8,
+       rc2_cbc_init_key,
+       rc2_cbc_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+       rc2_set_asn1_type_and_iv,
+       rc2_get_asn1_type_and_iv,
        };
 
 EVP_CIPHER *EVP_rc2_cbc()
        {
        return(&r2_cbc_cipher);
        }
+
+EVP_CIPHER *EVP_rc2_64_cbc()
+       {
+       return(&r2_64_cbc_cipher);
+       }
+
+EVP_CIPHER *EVP_rc2_40_cbc()
+       {
+       return(&r2_40_cbc_cipher);
+       }
        
 static void rc2_cbc_init_key(ctx,key,iv,enc)
 EVP_CIPHER_CTX *ctx;
@@ -93,11 +148,11 @@ unsigned char *iv;
 int enc;
        {
        if (iv != NULL)
-               memcpy(&(ctx->c.rc2_cbc.oiv[0]),iv,8);
-       memcpy(&(ctx->c.rc2_cbc.iv[0]),&(ctx->c.rc2_cbc.oiv[0]),8);
+               memcpy(&(ctx->oiv[0]),iv,8);
+       memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
-               RC2_set_key(&(ctx->c.rc2_cbc.ks),EVP_RC2_KEY_SIZE,key,
-                       EVP_RC2_KEY_SIZE*8);
+               RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
+                       key,EVP_CIPHER_CTX_key_length(ctx)*8);
        }
 
 static void rc2_cbc_cipher(ctx,out,in,inl)
@@ -108,8 +163,77 @@ unsigned int inl;
        {
        RC2_cbc_encrypt(
                in,out,(long)inl,
-               &(ctx->c.rc2_cbc.ks),&(ctx->c.rc2_cbc.iv[0]),
+               &(ctx->c.rc2_ks),&(ctx->iv[0]),
                ctx->encrypt);
        }
 
+static int rc2_meth_to_magic(e)
+const EVP_CIPHER *e;
+       {
+       int i;
+
+       i=EVP_CIPHER_key_length(e);
+       if      (i == 128) return(RC2_128_MAGIC);
+       else if (i == 64)  return(RC2_64_MAGIC);
+       else if (i == 40)  return(RC2_40_MAGIC);
+       else return(0);
+       }
+
+static EVP_CIPHER *rc2_magic_to_meth(i)
+int i;
+       {
+       if      (i == RC2_128_MAGIC) return(EVP_rc2_cbc());
+       else if (i == RC2_64_MAGIC)  return(EVP_rc2_64_cbc());
+       else if (i == RC2_40_MAGIC)  return(EVP_rc2_40_cbc());
+       else
+               {
+               EVPerr(EVP_F_RC2_MAGIC_TO_METH,EVP_R_UNSUPPORTED_KEY_SIZE);
+               return(NULL);
+               }
+       }
+
+static int rc2_get_asn1_type_and_iv(c,type)
+EVP_CIPHER_CTX *c;
+ASN1_TYPE *type;
+       {
+       long num=0;
+       int i=0,l;
+       EVP_CIPHER *e;
+
+       if (type != NULL)
+               {
+               l=EVP_CIPHER_CTX_iv_length(c);
+               i=ASN1_TYPE_get_int_octetstring(type,&num,c->oiv,l);
+               if (i != l)
+                       return(-1);
+               else if (i > 0)
+                       memcpy(c->iv,c->oiv,l);
+               e=rc2_magic_to_meth((int)num);
+               if (e == NULL)
+                       return(-1);
+               if (e != EVP_CIPHER_CTX_cipher(c))
+                       {
+                       EVP_CIPHER_CTX_cipher(c)=e;
+                       rc2_cbc_init_key(c,NULL,NULL,1);
+                       }
+               }
+       return(i);
+       }
+
+static int rc2_set_asn1_type_and_iv(c,type)
+EVP_CIPHER_CTX *c;
+ASN1_TYPE *type;
+       {
+       long num;
+       int i=0,j;
+
+       if (type != NULL)
+               {
+               num=rc2_meth_to_magic(EVP_CIPHER_CTX_cipher(c));
+               j=EVP_CIPHER_CTX_iv_length(c);
+               i=ASN1_TYPE_set_int_octetstring(type,num,c->oiv,j);
+               }
+       return(i);
+       }
+
 #endif