diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-10-20 01:50:23 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-10-20 01:50:23 +0000 |
| commit | 08e9c1af6c26f74ef7f7524be4b89241ff232a8c (patch) | |
| tree | 7fe3f66fdfb1f20a5bfcbbf98369032374f3a79b /crypto/x509 | |
| parent | 023c8d0b0aec445b680ef5aea2bd2154adb59974 (diff) | |
| download | openssl-08e9c1af6c26f74ef7f7524be4b89241ff232a8c.tar.gz | |
Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
tolerated in certificates.
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_cmp.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_r2x.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_set.c | 14 | ||||
| -rw-r--r-- | crypto/x509/x509_v3.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 6213ec2f8d..0b0f1605da 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -69,7 +69,7 @@ int X509_issuer_and_serial_cmp(X509 *a, X509 *b) ai=a->cert_info; bi=b->cert_info; - i=ASN1_INTEGER_cmp(ai->serialNumber,bi->serialNumber); + i=M_ASN1_INTEGER_cmp(ai->serialNumber,bi->serialNumber); if (i) return(i); return(X509_NAME_cmp(ai->issuer,bi->issuer)); } diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c index bb4697ae60..db051033d9 100644 --- a/crypto/x509/x509_r2x.c +++ b/crypto/x509/x509_r2x.c @@ -82,7 +82,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) { - if ((xi->version=ASN1_INTEGER_new()) == NULL) goto err; + if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err; if (!ASN1_INTEGER_set(xi->version,2)) goto err; /* xi->extensions=ri->attributes; <- bad, should not ever be done ri->attributes=NULL; */ diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c index 5a6f7b414f..add842d17a 100644 --- a/crypto/x509/x509_set.c +++ b/crypto/x509/x509_set.c @@ -68,7 +68,7 @@ int X509_set_version(X509 *x, long version) if (x == NULL) return(0); if (x->cert_info->version == NULL) { - if ((x->cert_info->version=ASN1_INTEGER_new()) == NULL) + if ((x->cert_info->version=M_ASN1_INTEGER_new()) == NULL) return(0); } return(ASN1_INTEGER_set(x->cert_info->version,version)); @@ -82,10 +82,10 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial) in=x->cert_info->serialNumber; if (in != serial) { - in=ASN1_INTEGER_dup(serial); + in=M_ASN1_INTEGER_dup(serial); if (in != NULL) { - ASN1_INTEGER_free(x->cert_info->serialNumber); + M_ASN1_INTEGER_free(x->cert_info->serialNumber); x->cert_info->serialNumber=in; } } @@ -112,10 +112,10 @@ int X509_set_notBefore(X509 *x, ASN1_UTCTIME *tm) in=x->cert_info->validity->notBefore; if (in != tm) { - in=ASN1_UTCTIME_dup(tm); + in=M_ASN1_UTCTIME_dup(tm); if (in != NULL) { - ASN1_UTCTIME_free(x->cert_info->validity->notBefore); + M_ASN1_UTCTIME_free(x->cert_info->validity->notBefore); x->cert_info->validity->notBefore=in; } } @@ -130,10 +130,10 @@ int X509_set_notAfter(X509 *x, ASN1_UTCTIME *tm) in=x->cert_info->validity->notAfter; if (in != tm) { - in=ASN1_UTCTIME_dup(tm); + in=M_ASN1_UTCTIME_dup(tm); if (in != NULL) { - ASN1_UTCTIME_free(x->cert_info->validity->notAfter); + M_ASN1_UTCTIME_free(x->cert_info->validity->notAfter); x->cert_info->validity->notAfter=in; } } diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c index dd2f9f1b17..5721f78510 100644 --- a/crypto/x509/x509_v3.c +++ b/crypto/x509/x509_v3.c @@ -242,7 +242,7 @@ int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) int i; if (ex == NULL) return(0); - i=ASN1_OCTET_STRING_set(ex->value,data->data,data->length); + i=M_ASN1_OCTET_STRING_set(ex->value,data->data,data->length); if (!i) return(0); return(1); } |