diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-14 04:16:42 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-23 13:15:06 +0000 |
commit | f422a51486a3ab415153eccdc3c3746c53da01f4 (patch) | |
tree | 7048cd4c4b3857f13ee0468d9059a0e24b17c885 /crypto/x509/x509cset.c | |
parent | 2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe (diff) |
Remove old ASN.1 code.
Remove old M_ASN1_ macros and replace any occurences with the corresponding
function.
Remove d2i_ASN1_bytes, d2i_ASN1_SET, i2d_ASN1_SET: no longer used internally.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/x509/x509cset.c')
-rw-r--r-- | crypto/x509/x509cset.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c index 24ca35b58b..042c90de86 100644 --- a/crypto/x509/x509cset.c +++ b/crypto/x509/x509cset.c @@ -69,7 +69,7 @@ int X509_CRL_set_version(X509_CRL *x, long version) if (x == NULL) return (0); if (x->crl->version == NULL) { - if ((x->crl->version = M_ASN1_INTEGER_new()) == NULL) + if ((x->crl->version = ASN1_INTEGER_new()) == NULL) return (0); } return (ASN1_INTEGER_set(x->crl->version, version)); @@ -90,9 +90,9 @@ int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm) return (0); in = x->crl->lastUpdate; if (in != tm) { - in = M_ASN1_TIME_dup(tm); + in = ASN1_STRING_dup(tm); if (in != NULL) { - M_ASN1_TIME_free(x->crl->lastUpdate); + ASN1_TIME_free(x->crl->lastUpdate); x->crl->lastUpdate = in; } } @@ -107,9 +107,9 @@ int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm) return (0); in = x->crl->nextUpdate; if (in != tm) { - in = M_ASN1_TIME_dup(tm); + in = ASN1_STRING_dup(tm); if (in != NULL) { - M_ASN1_TIME_free(x->crl->nextUpdate); + ASN1_TIME_free(x->crl->nextUpdate); x->crl->nextUpdate = in; } } @@ -140,9 +140,9 @@ int X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm) return (0); in = x->revocationDate; if (in != tm) { - in = M_ASN1_TIME_dup(tm); + in = ASN1_STRING_dup(tm); if (in != NULL) { - M_ASN1_TIME_free(x->revocationDate); + ASN1_TIME_free(x->revocationDate); x->revocationDate = in; } } @@ -157,9 +157,9 @@ int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial) return (0); in = x->serialNumber; if (in != serial) { - in = M_ASN1_INTEGER_dup(serial); + in = ASN1_INTEGER_dup(serial); if (in != NULL) { - M_ASN1_INTEGER_free(x->serialNumber); + ASN1_INTEGER_free(x->serialNumber); x->serialNumber = in; } } |