Commit c05353c5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Rename asc2uni and uni2asc functions to avoid clashes.

parent 73ea4160

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8k and 1.0  [xx XXX xxxx]



  *) Rename uni2asc and asc2uni functions to OPENSSL_uni2asc and

     OPENSSL_asc2uni the original names were too generic and cause name

     clashes on Netware.

     [Guenter <lists@gknw.net>]



  *) Add ECDHE and PSK support to DTLS.

     [Michael Tuexen <tuexen@fh-muenster.de>]

apps/pkcs12.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name) 
			av = sk_ASN1_TYPE_value(attr->value.set, 0);

			switch(av->type) {

				case V_ASN1_BMPSTRING:

        			value = uni2asc(av->value.bmpstring->data,

        			value = OPENSSL_uni2asc(av->value.bmpstring->data,

                                	       av->value.bmpstring->length);

				BIO_printf(out, "%s\n", value);

				OPENSSL_free(value);

crypto/pkcs12/p12_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) 
	ASN1_TYPE *atype;

	if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL;

	if (atype->type != V_ASN1_BMPSTRING) return NULL;

	return uni2asc(atype->value.bmpstring->data,

	return OPENSSL_uni2asc(atype->value.bmpstring->data,

				 atype->value.bmpstring->length);

}

crypto/pkcs12/p12_key.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, 
	if(!pass) {

		unipass = NULL;

		uniplen = 0;

	} else if (!asc2uni(pass, passlen, &unipass, &uniplen)) {

	} else if (!OPENSSL_asc2uni(pass, passlen, &unipass, &uniplen)) {

		PKCS12err(PKCS12_F_PKCS12_KEY_GEN_ASC,ERR_R_MALLOC_FAILURE);

		return 0;

	}

crypto/pkcs12/p12_utl.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


/* Cheap and nasty Unicode stuff */



unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)

unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)

{

	int ulen, i;

	unsigned char *unitmp;
@@ -81,7 +81,7 @@ unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *un 
	return unitmp;

}



char *uni2asc(unsigned char *uni, int unilen)

char *OPENSSL_uni2asc(unsigned char *uni, int unilen)

{

	int asclen, i;

	char *asctmp;