Added attached patches against 0.9.8-stable and 1.0.0-stable.
diff -ur openssl-0.9.8-stable-SNAP-20090531.orig/apps/pkcs12.c openssl-0.9.8-stable-SNAP-20090531/apps/pkcs12.c
--- openssl-0.9.8-stable-SNAP-20090531.orig/apps/pkcs12.c 2008-11-06 06:01:11.000000000 +1100
+++ openssl-0.9.8-stable-SNAP-20090531/apps/pkcs12.c 2009-06-01 10:49:47.859375000 +1000
@@ -929,7 +929,7 @@
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);
diff -ur openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/p12_attr.c openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/p12_attr.c
--- openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/p12_attr.c 2008-11-06 06:01:21.000000000 +1100
+++ openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/p12_attr.c 2009-06-01 10:49:44.796875000 +1000
@@ -139,7 +139,7 @@
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);
}
diff -ur openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/p12_key.c openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/p12_key.c
--- openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/p12_key.c 2008-11-06 06:01:21.000000000 +1100
+++ openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/p12_key.c 2009-06-01 10:44:00.109375000 +1000
@@ -84,7 +84,7 @@
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;
}
diff -ur openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/p12_utl.c openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/p12_utl.c
--- openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/p12_utl.c 2008-11-06 06:01:21.000000000 +1100
+++ openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/p12_utl.c 2009-06-01 10:49:41.484375000 +1000
@@ -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 @@
return unitmp;
}
-char *uni2asc(unsigned char *uni, int unilen)
+char *OPENSSL_uni2asc(unsigned char *uni, int unilen)
{
int asclen, i;
char *asctmp;
diff -ur openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/pkcs12.h openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/pkcs12.h
--- openssl-0.9.8-stable-SNAP-20090531.orig/crypto/pkcs12/pkcs12.h 2008-11-06 06:01:21.000000000 +1100
+++ openssl-0.9.8-stable-SNAP-20090531/crypto/pkcs12/pkcs12.h 2009-06-01 10:49:38.765625000 +1000
@@ -232,8 +232,8 @@
const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type);
-unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
-char *uni2asc(unsigned char *uni, int unilen);
+unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
+char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
diff -ur openssl-1.0.0-stable-SNAP-20090531.orig/apps/pkcs12.c openssl-1.0.0-stable-SNAP-20090531/apps/pkcs12.c
--- openssl-1.0.0-stable-SNAP-20090531.orig/apps/pkcs12.c 2008-11-06 05:38:51.000000000 +1100
+++ openssl-1.0.0-stable-SNAP-20090531/apps/pkcs12.c 2009-06-01 11:08:55.093750000 +1000
@@ -923,7 +923,7 @@
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);
diff -ur openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/p12_attr.c openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/p12_attr.c
--- openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/p12_attr.c 2008-11-06 05:39:00.000000000 +1100
+++ openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/p12_attr.c 2009-06-01 11:08:43.625000000 +1000
@@ -139,7 +139,7 @@
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);
}
diff -ur openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/p12_key.c openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/p12_key.c
--- openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/p12_key.c 2008-12-30 03:11:56.000000000 +1100
+++ openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/p12_key.c 2009-06-01 11:08:46.421875000 +1000
@@ -85,7 +85,7 @@
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;
}
diff -ur openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/p12_utl.c openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/p12_utl.c
--- openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/p12_utl.c 2008-11-06 05:39:00.000000000 +1100
+++ openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/p12_utl.c 2009-06-01 11:08:48.921875000 +1000
@@ -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 @@
return unitmp;
}
-char *uni2asc(unsigned char *uni, int unilen)
+char *OPENSSL_uni2asc(unsigned char *uni, int unilen)
{
int asclen, i;
char *asctmp;
diff -ur openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/pkcs12.h openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/pkcs12.h
--- openssl-1.0.0-stable-SNAP-20090531.orig/crypto/pkcs12/pkcs12.h 2008-11-12 14:58:04.000000000 +1100
+++ openssl-1.0.0-stable-SNAP-20090531/crypto/pkcs12/pkcs12.h 2009-06-01 11:08:52.031250000 +1000
@@ -230,8 +230,8 @@
const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type);
-unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
-char *uni2asc(unsigned char *uni, int unilen);
+unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
+char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
