Commit 8686c474 authored by Paul Yang's avatar Paul Yang Committed by Matt Caswell
Browse files

Fix coding style in crypto/rsa directory 



this part contains only the return (x) fix.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4223)
parent b5fe5dfb

crypto/rsa/rsa_crpt.c

+9 −9
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -17,41 +17,41 @@ 


int RSA_bits(const RSA *r)

{

    return (BN_num_bits(r->n));

    return BN_num_bits(r->n);

}



int RSA_size(const RSA *r)

{

    return (BN_num_bytes(r->n));

    return BN_num_bytes(r->n);

}



int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,

                       RSA *rsa, int padding)

{

    return (rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding));

    return rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding);

}



int RSA_private_encrypt(int flen, const unsigned char *from,

                        unsigned char *to, RSA *rsa, int padding)

{

    return (rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding));

    return rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding);

}



int RSA_private_decrypt(int flen, const unsigned char *from,

                        unsigned char *to, RSA *rsa, int padding)

{

    return (rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding));

    return rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding);

}



int RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to,

                       RSA *rsa, int padding)

{

    return (rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding));

    return rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding);

}



int RSA_flags(const RSA *r)

{

    return ((r == NULL) ? 0 : r->meth->flags);

    return r == NULL ? 0 : r->meth->flags;

}



void RSA_blinding_off(RSA *rsa)
@@ -77,7 +77,7 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *ctx) 
    rsa->flags &= ~RSA_FLAG_NO_BLINDING;

    ret = 1;

 err:

    return (ret);

    return ret;

}



static BIGNUM *rsa_get_public_exp(const BIGNUM *d, const BIGNUM *p,

crypto/rsa/rsa_lib.c

+4 −4
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -148,17 +148,17 @@ int RSA_up_ref(RSA *r) 


    REF_PRINT_COUNT("RSA", r);

    REF_ASSERT_ISNT(i < 2);

    return ((i > 1) ? 1 : 0);

    return i > 1 ? 1 : 0;

}



int RSA_set_ex_data(RSA *r, int idx, void *arg)

{

    return (CRYPTO_set_ex_data(&r->ex_data, idx, arg));

    return CRYPTO_set_ex_data(&r->ex_data, idx, arg);

}



void *RSA_get_ex_data(const RSA *r, int idx)

{

    return (CRYPTO_get_ex_data(&r->ex_data, idx));

    return CRYPTO_get_ex_data(&r->ex_data, idx);

}



int RSA_security_bits(const RSA *rsa)

crypto/rsa/rsa_none.c

+6 −6
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -16,16 +16,16 @@ int RSA_padding_add_none(unsigned char *to, int tlen, 
{

    if (flen > tlen) {

        RSAerr(RSA_F_RSA_PADDING_ADD_NONE, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);

        return (0);

        return 0;

    }



    if (flen < tlen) {

        RSAerr(RSA_F_RSA_PADDING_ADD_NONE, RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE);

        return (0);

        return 0;

    }



    memcpy(to, from, (unsigned int)flen);

    return (1);

    return 1;

}



int RSA_padding_check_none(unsigned char *to, int tlen,
@@ -34,10 +34,10 @@ int RSA_padding_check_none(unsigned char *to, int tlen, 


    if (flen > tlen) {

        RSAerr(RSA_F_RSA_PADDING_CHECK_NONE, RSA_R_DATA_TOO_LARGE);

        return (-1);

        return -1;

    }



    memset(to, 0, tlen - flen);

    memcpy(to + tlen - flen, from, flen);

    return (tlen);

    return tlen;

}

crypto/rsa/rsa_ossl.c

+7 −7
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, 
        BN_CTX_end(ctx);

    BN_CTX_free(ctx);

    OPENSSL_clear_free(buf, num);

    return (r);

    return r;

}



static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
@@ -365,7 +365,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from, 
        BN_CTX_end(ctx);

    BN_CTX_free(ctx);

    OPENSSL_clear_free(buf, num);

    return (r);

    return r;

}



static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
@@ -496,7 +496,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from, 
        BN_CTX_end(ctx);

    BN_CTX_free(ctx);

    OPENSSL_clear_free(buf, num);

    return (r);

    return r;

}



/* signature verification */
@@ -595,7 +595,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from, 
        BN_CTX_end(ctx);

    BN_CTX_free(ctx);

    OPENSSL_clear_free(buf, num);

    return (r);

    return r;

}



static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
@@ -787,13 +787,13 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 
    ret = 1;

 err:

    BN_CTX_end(ctx);

    return (ret);

    return ret;

}



static int rsa_ossl_init(RSA *rsa)

{

    rsa->flags |= RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_CACHE_PRIVATE;

    return (1);

    return 1;

}



static int rsa_ossl_finish(RSA *rsa)
@@ -801,5 +801,5 @@ static int rsa_ossl_finish(RSA *rsa) 
    BN_MONT_CTX_free(rsa->_method_mod_n);

    BN_MONT_CTX_free(rsa->_method_mod_p);

    BN_MONT_CTX_free(rsa->_method_mod_q);

    return (1);

    return 1;

}

crypto/rsa/rsa_pk1.c

+13 −13
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -24,7 +24,7 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen, 
    if (flen > (tlen - RSA_PKCS1_PADDING_SIZE)) {

        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1,

               RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);

        return (0);

        return 0;

    }



    p = (unsigned char *)to;
@@ -38,7 +38,7 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen, 
    p += j;

    *(p++) = '\0';

    memcpy(p, from, (unsigned int)flen);

    return (1);

    return 1;

}



int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
@@ -73,7 +73,7 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen, 
    if ((num != (flen + 1)) || (*(p++) != 0x01)) {

        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,

               RSA_R_BLOCK_TYPE_IS_NOT_01);

        return (-1);

        return -1;

    }



    /* scan over padding data */
@@ -86,7 +86,7 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen, 
            } else {

                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,

                       RSA_R_BAD_FIXED_HEADER_DECRYPT);

                return (-1);

                return -1;

            }

        }

        p++;
@@ -95,23 +95,23 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen, 
    if (i == j) {

        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,

               RSA_R_NULL_BEFORE_BLOCK_MISSING);

        return (-1);

        return -1;

    }



    if (i < 8) {

        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,

               RSA_R_BAD_PAD_BYTE_COUNT);

        return (-1);

        return -1;

    }

    i++;                        /* Skip over the '\0' */

    j -= i;

    if (j > tlen) {

        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1, RSA_R_DATA_TOO_LARGE);

        return (-1);

        return -1;

    }

    memcpy(to, p, (unsigned int)j);



    return (j);

    return j;

}



int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
@@ -123,7 +123,7 @@ int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen, 
    if (flen > (tlen - 11)) {

        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2,

               RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);

        return (0);

        return 0;

    }



    p = (unsigned char *)to;
@@ -135,12 +135,12 @@ int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen, 
    j = tlen - 3 - flen;



    if (RAND_bytes(p, j) <= 0)

        return (0);

        return 0;

    for (i = 0; i < j; i++) {

        if (*p == '\0')

            do {

                if (RAND_bytes(p, 1) <= 0)

                    return (0);

                    return 0;

            } while (*p == '\0');

        p++;

    }
@@ -148,7 +148,7 @@ int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen, 
    *(p++) = '\0';



    memcpy(p, from, (unsigned int)flen);

    return (1);

    return 1;

}



int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,