diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/x_crl.c | 3 | ||||
| -rw-r--r-- | crypto/bio/bss_file.c | 3 | ||||
| -rw-r--r-- | crypto/pem/pem_all.c | 1 | ||||
| -rw-r--r-- | crypto/rsa/rsa_eay.c | 5 |
4 files changed, 7 insertions, 5 deletions
diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index 8012eb140b..027950330d 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -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) diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index b3849e7dcc..0776383448 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -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); diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 1a867a8867..8ef8f18c42 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -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, diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c index e1981d0b3d..b8d9221592 100644 --- a/crypto/rsa/rsa_eay.c +++ b/crypto/rsa/rsa_eay.c @@ -881,9 +881,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 |