diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-21 23:56:21 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:38:49 +0000 |
| commit | 47050853f13b07f91b5b4a058dcb188621296f21 (patch) | |
| tree | b39655bc64f7214931b5c9bfe3d3406a38bef145 /crypto | |
| parent | 10621efd3296a92f489f6ab26a88e88d9790930e (diff) | |
| download | openssl-new-47050853f13b07f91b5b4a058dcb188621296f21.tar.gz | |
Rerun util/openssl-format-source -v -c .OpenSSL_1_0_1-post-auto-reformat
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/x_crl.c | 2 | ||||
| -rw-r--r-- | crypto/bio/bss_file.c | 3 | ||||
| -rw-r--r-- | crypto/ec/ecp_smpl.c | 5 | ||||
| -rw-r--r-- | crypto/rsa/rsa_eay.c | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index cd5c0bfb18..e258c714b2 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -344,6 +344,7 @@ IMPLEMENT_ASN1_FUNCTIONS(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, @@ -510,4 +511,5 @@ IMPLEMENT_STACK_OF(X509_REVOKED) IMPLEMENT_ASN1_SET_OF(X509_REVOKED) IMPLEMENT_STACK_OF(X509_CRL) + IMPLEMENT_ASN1_SET_OF(X509_CRL) diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index d3da7e789f..d7f15b0699 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -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); diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c index 4e75709053..d196dedfb3 100644 --- a/crypto/ec/ecp_smpl.c +++ b/crypto/ec/ecp_smpl.c @@ -1299,9 +1299,8 @@ 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], - &points[i]->Z, ctx)) + if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1], + &points[i]->Z, ctx)) goto err; } else { if (!BN_copy(prod_Z[i], prod_Z[i - 1])) diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c index a6df3be59b..b147fff8bd 100644 --- a/crypto/rsa/rsa_eay.c +++ b/crypto/rsa/rsa_eay.c @@ -842,9 +842,8 @@ 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, - rsa->_method_mod_n)) + if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, + rsa->_method_mod_n)) goto err; /* * If 'I' was greater than (or equal to) rsa->n, the operation will |