Commit 323d39e8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Rerun util/openssl-format-source -v -c . 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent ae5c8664

crypto/asn1/x_crl.c

+3 −0
Original line number Diff line number Diff line
@@ -344,7 +344,9 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED) 
IMPLEMENT_ASN1_DUP_FUNCTION(X509_REVOKED)



IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)



IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)



IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)



static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
@@ -511,4 +513,5 @@ IMPLEMENT_STACK_OF(X509_REVOKED) 
IMPLEMENT_ASN1_SET_OF(X509_REVOKED)



IMPLEMENT_STACK_OF(X509_CRL)



IMPLEMENT_ASN1_SET_OF(X509_CRL)

crypto/bio/bss_file.c

+1 −2
Original line number Diff line number Diff line
@@ -239,8 +239,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl) 
        else

            ret = fread(out, 1, (int)outl, (FILE *)b->ptr);

        if (ret == 0

            && (b->

                flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :

            && (b->flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :

            ferror((FILE *)b->ptr)) {

            SYSerr(SYS_F_FREAD, get_last_sys_error());

            BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);

crypto/ec/ecp_smpl.c

+2 −3
Original line number Diff line number Diff line
@@ -1299,8 +1299,7 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, 


    for (i = 1; i < num; i++) {

        if (!BN_is_zero(&points[i]->Z)) {

            if (!group->

                meth->field_mul(group, prod_Z[i], prod_Z[i - 1],

            if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1],

                                        &points[i]->Z, ctx))

                goto err;

        } else {

crypto/rsa/rsa_eay.c

+2 −3
Original line number Diff line number Diff line
@@ -842,8 +842,7 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 
        goto err;



    if (rsa->e && rsa->n) {

        if (!rsa->

            meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,

        if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,

                                   rsa->_method_mod_n))

            goto err;

        /*

engines/e_padlock.c

+3 −1
Original line number Diff line number Diff line
@@ -587,7 +587,9 @@ pushfd cld mov esi, ecx mov edi, ecx mov ecx, 60 up:lodsd 
#    if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb)

#     define NID_aes_256_ofb NID_aes_256_ofb128

#    endif

/* List of supported ciphers. */ static int padlock_cipher_nids[] = {

/*

 * List of supported ciphers.

 */ static int padlock_cipher_nids[] = {

    NID_aes_128_ecb,

    NID_aes_128_cbc,

    NID_aes_128_cfb,