Commit 24e6a0db authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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



RT#4210

(1.0.2-specific adaptation of 7687f525)

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 6533a0b8

crypto/evp/e_des.c

+6 −5
Original line number Diff line number Diff line
@@ -71,12 +71,13 @@ typedef struct { 
        DES_key_schedule ks;

    } ks;

    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;

} EVP_DES_KEY;



# 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... */

#  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_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,

                        DES_key_schedule *ks, unsigned char iv[8]);

                        const DES_key_schedule *ks, unsigned char iv[8]);

# endif



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;



    if (dat->stream.cbc) {

    if (dat->stream.cbc != NULL) {

        (*dat->stream.cbc) (in, out, inl, &dat->ks.ks, ctx->iv);

        return 1;

    }

crypto/evp/e_des3.c

+6 −5
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ typedef struct { 
        DES_key_schedule ks[3];

    } ks;

    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;

} DES_EDE_KEY;

# 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_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,

                             DES_key_schedule *ks, unsigned char iv[8]);

                             const DES_key_schedule ks[3], unsigned char iv[8]);

# endif



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;

    if (inl < 24)

        return -1;

    if (!out)

    if (out == NULL)

        return inl - 16;

    memcpy(ctx->iv, wrap_iv, 8);

    /* 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)

{

    unsigned char sha1tmp[SHA_DIGEST_LENGTH];

    if (!out)

    if (out == NULL)

        return inl + 16;

    /* Copy input to output buffer + 8 so we have space for IV */

    memmove(out + 8, in, inl);