Rename asc2uni and uni2asc functions to avoid clashes.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 17 Jun 2009 12:04:56 +0000 (12:04 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 17 Jun 2009 12:04:56 +0000 (12:04 +0000)
CHANGES
apps/pkcs12.c
crypto/pkcs12/p12_attr.c
crypto/pkcs12/p12_key.c
crypto/pkcs12/p12_utl.c
crypto/pkcs12/pkcs12.h
util/libeay.num

diff --git a/CHANGES b/CHANGES
index cf7c58c..65ff95a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
 
index 9c43125..39686b6 100644 (file)
@@ -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);
index 68d6c5a..e4d9c25 100644 (file)
@@ -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);
 }
 
index b72cf16..a29794b 100644 (file)
@@ -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;
        }
index ca30ac4..59c6f45 100644 (file)
@@ -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;
index 425274d..b17eb9f 100644 (file)
@@ -230,8 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
                   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)
index 5e9cc92..c4cfffa 100755 (executable)
@@ -1255,8 +1255,8 @@ PKCS12_gen_mac                          1278      EXIST::FUNCTION:
 PKCS12_verify_mac                       1279   EXIST::FUNCTION:
 PKCS12_set_mac                          1280   EXIST::FUNCTION:
 PKCS12_setup_mac                        1281   EXIST::FUNCTION:
-asc2uni                                 1282   EXIST::FUNCTION:
-uni2asc                                 1283   EXIST::FUNCTION:
+OPENSSL_asc2uni                         1282   EXIST::FUNCTION:
+OPENSSL_uni2asc                         1283   EXIST::FUNCTION:
 i2d_PKCS12_BAGS                         1284   EXIST::FUNCTION:
 PKCS12_BAGS_new                         1285   EXIST::FUNCTION:
 d2i_PKCS12_BAGS                         1286   EXIST::FUNCTION: