OpenSSL 1.1.1-pre2
This commit is contained in:
+8
-8
@@ -72,12 +72,12 @@ static const EVP_CIPHER r2_40_cbc_cipher = {
|
||||
|
||||
const EVP_CIPHER *EVP_rc2_64_cbc(void)
|
||||
{
|
||||
return (&r2_64_cbc_cipher);
|
||||
return &r2_64_cbc_cipher;
|
||||
}
|
||||
|
||||
const EVP_CIPHER *EVP_rc2_40_cbc(void)
|
||||
{
|
||||
return (&r2_40_cbc_cipher);
|
||||
return &r2_40_cbc_cipher;
|
||||
}
|
||||
|
||||
static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
|
||||
@@ -94,13 +94,13 @@ static int rc2_meth_to_magic(EVP_CIPHER_CTX *e)
|
||||
|
||||
EVP_CIPHER_CTX_ctrl(e, EVP_CTRL_GET_RC2_KEY_BITS, 0, &i);
|
||||
if (i == 128)
|
||||
return (RC2_128_MAGIC);
|
||||
return RC2_128_MAGIC;
|
||||
else if (i == 64)
|
||||
return (RC2_64_MAGIC);
|
||||
return RC2_64_MAGIC;
|
||||
else if (i == 40)
|
||||
return (RC2_40_MAGIC);
|
||||
return RC2_40_MAGIC;
|
||||
else
|
||||
return (0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rc2_magic_to_meth(int i)
|
||||
@@ -113,7 +113,7 @@ static int rc2_magic_to_meth(int i)
|
||||
return 40;
|
||||
else {
|
||||
EVPerr(EVP_F_RC2_MAGIC_TO_METH, EVP_R_UNSUPPORTED_KEY_SIZE);
|
||||
return (0);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
|
||||
(unsigned char *)EVP_CIPHER_CTX_original_iv(c),
|
||||
j);
|
||||
}
|
||||
return (i);
|
||||
return i;
|
||||
}
|
||||
|
||||
static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
|
||||
|
||||
Reference in New Issue
Block a user