summaryrefslogtreecommitdiffstats
path: root/crypto/x509v3/v3_ia5.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-10-20 01:50:23 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-10-20 01:50:23 +0000
commit08e9c1af6c26f74ef7f7524be4b89241ff232a8c (patch)
tree7fe3f66fdfb1f20a5bfcbbf98369032374f3a79b /crypto/x509v3/v3_ia5.c
parent023c8d0b0aec445b680ef5aea2bd2154adb59974 (diff)
Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
tolerated in certificates.
Diffstat (limited to 'crypto/x509v3/v3_ia5.c')
-rw-r--r--crypto/x509v3/v3_ia5.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c
index 3446c5cd6a..43dfd04f78 100644
--- a/crypto/x509v3/v3_ia5.c
+++ b/crypto/x509v3/v3_ia5.c
@@ -63,7 +63,6 @@
#include <openssl/conf.h>
#include <openssl/x509v3.h>
-static ASN1_IA5STRING *ia5string_new(void);
static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
X509V3_EXT_METHOD v3_ns_ia5_list[] = {
@@ -78,11 +77,6 @@ EXT_END
};
-static ASN1_IA5STRING *ia5string_new(void)
-{
- return ASN1_IA5STRING_new();
-}
-
static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
ASN1_IA5STRING *ia5)
{
@@ -102,10 +96,10 @@ static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
X509V3err(X509V3_F_S2I_ASN1_IA5STRING,X509V3_R_INVALID_NULL_ARGUMENT);
return NULL;
}
- if(!(ia5 = ASN1_IA5STRING_new())) goto err;
+ if(!(ia5 = M_ASN1_IA5STRING_new())) goto err;
if(!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str,
strlen(str))) {
- ASN1_IA5STRING_free(ia5);
+ M_ASN1_IA5STRING_free(ia5);
goto err;
}
return ia5;