Commit 6452a139 authored by Bjoern Zeeb's avatar Bjoern Zeeb Committed by Rich Salz
Browse files

RT671: export(i2s|s2i|i2v|v2i)_ASN1_(IA5|BIT)STRING 



The EXT_BITSTRING and EXT_IA5STRING are defined in x509v3.h, but
the low-level functions are not public. They are useful, no need
to make them static. Note that BITSTRING already was exposed since
this RT was created, so now we just export IA5STRING functions.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent e9edfc41

crypto/x509v3/v3_ia5.c

+2 −4
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ 
#include <openssl/conf.h>

#include <openssl/x509v3.h>



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);

const X509V3_EXT_METHOD v3_ns_ia5_list[] = { 

EXT_IA5STRING(NID_netscape_base_url),

EXT_IA5STRING(NID_netscape_revocation_url),
@@ -77,7 +75,7 @@ EXT_END 
};





static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

	     ASN1_IA5STRING *ia5)

{

	char *tmp;
@@ -91,7 +89,7 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, 
	return tmp;

}



static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

	     X509V3_CTX *ctx, char *str)

{

	ASN1_IA5STRING *ia5;

crypto/x509v3/x509v3.h

+4 −0
Original line number Diff line number Diff line
@@ -542,6 +542,10 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, 
STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,

				ASN1_BIT_STRING *bits,

				STACK_OF(CONF_VALUE) *extlist);

char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

		ASN1_IA5STRING *ia5);

ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,

		X509V3_CTX *ctx, char *str);



STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret);

int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);