Commit 739a5eee 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 0f113f3e

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 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/pem/pem_all.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u) 
IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA,

                             RSAPrivateKey)





IMPLEMENT_PEM_rw_const(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC,

                       RSAPublicKey) IMPLEMENT_PEM_rw(RSA_PUBKEY, RSA,

                                                      PEM_STRING_PUBLIC,

crypto/rsa/rsa_eay.c

+2 −3
Original line number Diff line number Diff line
@@ -881,8 +881,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;

        /*

ssl/d1_srvr.c

+1 −2
Original line number Diff line number Diff line
@@ -491,8 +491,7 @@ int dtls1_accept(SSL *s) 
                || ((alg_k & SSL_kRSA)

                    && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL

                        || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)

                            && EVP_PKEY_size(s->cert->

                                             pkeys

                            && EVP_PKEY_size(s->cert->pkeys

                                             [SSL_PKEY_RSA_ENC].privatekey) *

                            8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)

                        )