diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-08-20 13:02:09 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-21 18:25:23 +0100 |
| commit | 0b7347effee58f5a19e4724c4b277635727c20d8 (patch) | |
| tree | 42e1e32ddf704a4c196fccefa13e45db007bb975 /crypto | |
| parent | bf932fbd4a2385496fa5e9363bf9280fc6fba0ad (diff) | |
Add X509_getm_notBefore, X509_getm_notAfter
Add mutable versions of X509_get0_notBefore and X509_get0_notAfter.
Rename X509_SIG_get0_mutable to X509_SIG_getm.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/x_sig.c | 4 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 4 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_npas.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_set.c | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c index 1e835cb191..e465cf2d4d 100644 --- a/crypto/asn1/x_sig.c +++ b/crypto/asn1/x_sig.c @@ -29,8 +29,8 @@ void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg, *pdigest = sig->digest; } -void X509_SIG_get0_mutable(X509_SIG *sig, X509_ALGOR **palg, - ASN1_OCTET_STRING **pdigest) +void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg, + ASN1_OCTET_STRING **pdigest) { if (palg) *palg = sig->algor; diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index d608a5c02c..79639c2169 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -170,7 +170,7 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_GENERATION_ERROR); return 0; } - X509_SIG_get0_mutable(p12->mac->dinfo, NULL, &macoct); + X509_SIG_getm(p12->mac->dinfo, NULL, &macoct); if (!ASN1_OCTET_STRING_set(macoct, mac, maclen)) { PKCS12err(PKCS12_F_PKCS12_SET_MAC, PKCS12_R_MAC_STRING_SET_ERROR); return 0; @@ -208,7 +208,7 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, return 0; } else memcpy(p12->mac->salt->data, salt, saltlen); - X509_SIG_get0_mutable(p12->mac->dinfo, &macalg, NULL); + X509_SIG_getm(p12->mac->dinfo, &macalg, NULL); if (!X509_ALGOR_set0(macalg, OBJ_nid2obj(EVP_MD_type(md_type)), V_ASN1_NULL, NULL)) { PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c index f075bcacc3..0ce75ed330 100644 --- a/crypto/pkcs12/p12_npas.c +++ b/crypto/pkcs12/p12_npas.c @@ -110,7 +110,7 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass) if (!PKCS12_gen_mac(p12, newpass, -1, mac, &maclen)) goto err; - X509_SIG_get0_mutable(p12->mac->dinfo, NULL, &macoct); + X509_SIG_getm(p12->mac->dinfo, NULL, &macoct); if (!ASN1_OCTET_STRING_set(macoct, mac, maclen)) goto err; diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c index 8bf367b645..c0ea41883d 100644 --- a/crypto/x509/x509_set.c +++ b/crypto/x509/x509_set.c @@ -119,17 +119,15 @@ const ASN1_TIME *X509_get0_notAfter(const X509 *x) return x->cert_info.validity.notAfter; } -#if OPENSSL_API_COMPAT < 0x10100000L -ASN1_TIME *X509_get_notBefore(const X509 *x) +ASN1_TIME *X509_getm_notBefore(const X509 *x) { return x->cert_info.validity.notBefore; } -ASN1_TIME *X509_get_notAfter(const X509 *x) +ASN1_TIME *X509_getm_notAfter(const X509 *x) { return x->cert_info.validity.notAfter; } -#endif int X509_get_signature_type(const X509 *x) { |