root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

evp/e_des[3].c: address compiler warnings, fix formatting. 

RT#4210

(1.0.2-specific adaptation of 7687f52550)

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Andy Polyakov 2016-02-12 14:46:02 +01:00
parent 6533a0b8d1
commit 24e6a0dba4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/evp/e_des.c
View File

@ -71,12 +71,13 @@ typedef struct {
DES_key_schedule ks; DES_key_schedule ks;
} ks; } ks;
union { union {
void (*cbc) (const void *, void *, size_t, const void *, void *); void (*cbc) (const void *, void *, size_t,
const DES_key_schedule *, unsigned char *);
} stream; } stream;
} EVP_DES_KEY; } EVP_DES_KEY;
# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__)) # if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
/* ---------^^^ this is not a typo, just a way to detect that /* ----------^^^ this is not a typo, just a way to detect that
* assembler support was in general requested... */ * assembler support was in general requested... */
# include "sparc_arch.h" # include "sparc_arch.h"
@ -86,9 +87,9 @@ extern unsigned int OPENSSL_sparcv9cap_P[];
void des_t4_key_expand(const void *key, DES_key_schedule *ks); 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, void des_t4_cbc_encrypt(const void *inp, void *out, size_t len,
DES_key_schedule *ks, unsigned char iv[8]); const DES_key_schedule *ks, unsigned char iv[8]);
void des_t4_cbc_decrypt(const void *inp, void *out, size_t len, void des_t4_cbc_decrypt(const void *inp, void *out, size_t len,
DES_key_schedule *ks, unsigned char iv[8]); const DES_key_schedule *ks, unsigned char iv[8]);
# endif # endif
static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
@ -130,7 +131,7 @@ static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
EVP_DES_KEY *dat = (EVP_DES_KEY *) ctx->cipher_data; EVP_DES_KEY *dat = (EVP_DES_KEY *) ctx->cipher_data;
if (dat->stream.cbc) { if (dat->stream.cbc != NULL) {
(*dat->stream.cbc) (in, out, inl, &dat->ks.ks, ctx->iv); (*dat->stream.cbc) (in, out, inl, &dat->ks.ks, ctx->iv);
return 1; return 1;
} }

11
crypto/evp/e_des3.c
View File

@ -75,7 +75,8 @@ typedef struct {
DES_key_schedule ks[3]; DES_key_schedule ks[3];
} ks; } ks;
union { union {
void (*cbc) (const void *, void *, size_t, const void *, void *); void (*cbc) (const void *, void *, size_t,
const DES_key_schedule *, unsigned char *);
} stream; } stream;
} DES_EDE_KEY; } DES_EDE_KEY;
# define ks1 ks.ks[0] # define ks1 ks.ks[0]
@ -93,9 +94,9 @@ extern unsigned int OPENSSL_sparcv9cap_P[];
void des_t4_key_expand(const void *key, DES_key_schedule *ks); void des_t4_key_expand(const void *key, DES_key_schedule *ks);
void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len, void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len,
DES_key_schedule *ks, unsigned char iv[8]); const DES_key_schedule ks[3], unsigned char iv[8]);
void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len, void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len,
DES_key_schedule *ks, unsigned char iv[8]); const DES_key_schedule ks[3], unsigned char iv[8]);
# endif # endif
static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
@ -395,7 +396,7 @@ static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
int rv = -1; int rv = -1;
if (inl < 24) if (inl < 24)
return -1; return -1;
if (!out) if (out == NULL)
return inl - 16; return inl - 16;
memcpy(ctx->iv, wrap_iv, 8); memcpy(ctx->iv, wrap_iv, 8);
/* Decrypt first block which will end up as icv */ /* Decrypt first block which will end up as icv */
@ -438,7 +439,7 @@ static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
unsigned char sha1tmp[SHA_DIGEST_LENGTH]; unsigned char sha1tmp[SHA_DIGEST_LENGTH];
if (!out) if (out == NULL)
return inl + 16; return inl + 16;
/* Copy input to output buffer + 8 so we have space for IV */ /* Copy input to output buffer + 8 so we have space for IV */
memmove(out + 8, in, inl); memmove(out + 8, in, inl);