bignum: allow concurrent BN_MONT_CTX_set_locked()

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

diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
index ca009f2c5250ebda012f5ef8ceaa52ccd7388777..bf4366590f6d9bc03b0c30f998d98b76a41df2bc 100644 (file)
--- a/crypto/evp/e_des.c
+++ b/crypto/evp/e_des.c
@@ -65,6 +65,30 @@
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
+typedef struct
+       {
+       union { double align; DES_key_schedule ks; } ks;
+       union {
+               void (*cbc)(const void *,void *,size_t,const void *,void *);
+       } stream;
+       } EVP_DES_KEY;
+
+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+/* ---------^^^ this is not a typo, just a way to detect that
+ * assembler support was in general requested... */
+#include "sparc_arch.h"
+
+extern unsigned int OPENSSL_sparcv9cap_P[];
+
+#define SPARC_DES_CAPABLE      (OPENSSL_sparcv9cap_P[1] & CFR_DES)
+
+void   des_t4_key_expand(const void *key, DES_key_schedule *ks);
+void   des_t4_cbc_encrypt(const void *inp,void *out,size_t len,
+                               DES_key_schedule *ks,unsigned char iv[8]);
+void   des_t4_cbc_decrypt(const void *inp,void *out,size_t len,
+                               DES_key_schedule *ks,unsigned char iv[8]);
+#endif
+
 static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                        const unsigned char *iv, int enc);
 static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
@@ -99,6 +123,13 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                          const unsigned char *in, size_t inl)
 {
+       EVP_DES_KEY *dat = (EVP_DES_KEY *)ctx->cipher_data;
+
+       if (dat->stream.cbc)
+               {
+               (*dat->stream.cbc)(in,out,inl,&dat->ks.ks,ctx->iv);
+               return 1;
+               }
        while(inl>=EVP_MAXCHUNK)
                {
                DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK, ctx->cipher_data,
@@ -176,18 +207,18 @@ static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     return 1;
     }
 
-BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,
+BLOCK_CIPHER_defs(des, EVP_DES_KEY, NID_des, 8, 8, 8, 64,
                        EVP_CIPH_RAND_KEY, des_init_key, NULL,
                        EVP_CIPHER_set_asn1_iv,
                        EVP_CIPHER_get_asn1_iv,
                        des_ctrl)
 
-BLOCK_CIPHER_def_cfb(des,DES_key_schedule,NID_des,8,8,1,
+BLOCK_CIPHER_def_cfb(des,EVP_DES_KEY,NID_des,8,8,1,
                     EVP_CIPH_RAND_KEY, des_init_key,NULL,
                     EVP_CIPHER_set_asn1_iv,
                     EVP_CIPHER_get_asn1_iv,des_ctrl)
 
-BLOCK_CIPHER_def_cfb(des,DES_key_schedule,NID_des,8,8,8,
+BLOCK_CIPHER_def_cfb(des,EVP_DES_KEY,NID_des,8,8,8,
                     EVP_CIPH_RAND_KEY,des_init_key,NULL,
                     EVP_CIPHER_set_asn1_iv,
                     EVP_CIPHER_get_asn1_iv,des_ctrl)
@@ -196,8 +227,25 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                        const unsigned char *iv, int enc)
        {
        DES_cblock *deskey = (DES_cblock *)key;
+       EVP_DES_KEY *dat = (EVP_DES_KEY *)ctx->cipher_data;
+
+       dat->stream.cbc = NULL;
+#if defined(SPARC_DES_CAPABLE)
+       if (SPARC_DES_CAPABLE)
+               {
+               int mode = ctx->cipher->flags & EVP_CIPH_MODE;
+
+               if (mode == EVP_CIPH_CBC_MODE)
+                       {
+                       des_t4_key_expand(key,&dat->ks.ks);
+                       dat->stream.cbc = enc ? des_t4_cbc_encrypt :
+                                               des_t4_cbc_decrypt;
+                       return 1;
+                       }
+               }
+#endif
 #ifdef EVP_CHECK_DES_KEY
-       if(DES_set_key_checked(deskey,ctx->cipher_data) != 0)
+       if(DES_set_key_checked(deskey,dat->ks.ks) != 0)
                return 0;
 #else
        DES_set_key_unchecked(deskey,ctx->cipher_data);