generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from HEAD.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-06-17 12:05:51 +00:00
parent 27713e3fc2
commit 6178da0142
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -4,6 +4,11 @@
Changes between 0.9.8k and 1.0 [xx XXX xxxx] 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. *) Add ECDHE and PSK support to DTLS.
[Michael Tuexen <tuexen@fh-muenster.de>] [Michael Tuexen <tuexen@fh-muenster.de>]

2
apps/pkcs12.c
View 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); av = sk_ASN1_TYPE_value(attr->value.set, 0);
switch(av->type) { switch(av->type) {
case V_ASN1_BMPSTRING: case V_ASN1_BMPSTRING:
value = uni2asc(av->value.bmpstring->data, value = OPENSSL_uni2asc(av->value.bmpstring->data,
av->value.bmpstring->length); av->value.bmpstring->length);
BIO_printf(out, "%s\n", value); BIO_printf(out, "%s\n", value);
OPENSSL_free(value); OPENSSL_free(value);

2
crypto/pkcs12/p12_attr.c
View File

@ -139,7 +139,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
ASN1_TYPE *atype; ASN1_TYPE *atype;
if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL; if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL;
if (atype->type != V_ASN1_BMPSTRING) 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); atype->value.bmpstring->length);
} }

2
crypto/pkcs12/p12_key.c
View File

@ -85,7 +85,7 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
if(!pass) { if(!pass) {
unipass = NULL; unipass = NULL;
uniplen = 0; 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); PKCS12err(PKCS12_F_PKCS12_KEY_GEN_ASC,ERR_R_MALLOC_FAILURE);
return 0; return 0;
} }

4
crypto/pkcs12/p12_utl.c
View File

@ -62,7 +62,7 @@
/* Cheap and nasty Unicode stuff */ /* 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; int ulen, i;
unsigned char *unitmp; unsigned char *unitmp;
@ -81,7 +81,7 @@ unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *un
return unitmp; return unitmp;
} }
char *uni2asc(unsigned char *uni, int unilen) char *OPENSSL_uni2asc(unsigned char *uni, int unilen)
{ {
int asclen, i; int asclen, i;
char *asctmp; char *asctmp;

4
crypto/pkcs12/pkcs12.h
View File

@ -230,8 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
const EVP_MD *md_type); const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type); int saltlen, const EVP_MD *md_type);
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);
char *uni2asc(unsigned char *uni, int unilen); char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
DECLARE_ASN1_FUNCTIONS(PKCS12) DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA) DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)

4
util/libeay.num
View File

@ -1255,8 +1255,8 @@ PKCS12_gen_mac 1278 EXIST::FUNCTION:
PKCS12_verify_mac 1279 EXIST::FUNCTION: PKCS12_verify_mac 1279 EXIST::FUNCTION:
PKCS12_set_mac 1280 EXIST::FUNCTION: PKCS12_set_mac 1280 EXIST::FUNCTION:
PKCS12_setup_mac 1281 EXIST::FUNCTION: PKCS12_setup_mac 1281 EXIST::FUNCTION:
asc2uni 1282 EXIST::FUNCTION: OPENSSL_asc2uni 1282 EXIST::FUNCTION:
uni2asc 1283 EXIST::FUNCTION: OPENSSL_uni2asc 1283 EXIST::FUNCTION:
i2d_PKCS12_BAGS 1284 EXIST::FUNCTION: i2d_PKCS12_BAGS 1284 EXIST::FUNCTION:
PKCS12_BAGS_new 1285 EXIST::FUNCTION: PKCS12_BAGS_new 1285 EXIST::FUNCTION:
d2i_PKCS12_BAGS 1286 EXIST::FUNCTION: d2i_PKCS12_BAGS 1286 EXIST::FUNCTION: