Update from HEAD.

diff --git a/CHANGES b/CHANGES
index cf7c58ce50eebbcd876f9a5642aa3f69ed3145ba..65ff95a788d0b1e71be4fe798ac38aa82b0c14dc 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>]
 

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 9c431259dd4bca123697f887b44069fb8facf24c..39686b69db63ca41f7360766f34e89f8cd791cc7 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -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);

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 68d6c5ad159a432bc612f93c6e2d9d4e909611c8..e4d9c256470334e5515a5256c33b010470d3c0f4 100644 (file)
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -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);
 }
 

diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index b72cf1638b96ff474138bada88704682c883d1af..a29794bbbc1b0a3e06043e6893a21c73325e8052 100644 (file)
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -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;
        }

diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index ca30ac4f6d50696cd6461e4faa5d327f42f52cf3..59c6f453f6e5a6a304cb396a150c9cf01c1c1d76 100644 (file)
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -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;

diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 425274d4f7bc927ff3cff6f593f17c60f2762e93..b17eb9f42b8e70fbd9c94a390e8dc3b2d725ad34 100644 (file)
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -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)

diff --git a/util/libeay.num b/util/libeay.num
index 5e9cc927c9ba084fa17af71a05a10f568261c786..c4cfffae801781f0b33a7129db666aaf831a01ae 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -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: