diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/pkcs12/p12_attr.c | |
| parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
| download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_attr.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c index 68d6c5ad15..e4d9c25647 100644 --- a/src/lib/libcrypto/pkcs12/p12_attr.c +++ b/src/lib/libcrypto/pkcs12/p12_attr.c | |||
| @@ -139,7 +139,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) | |||
| 139 | ASN1_TYPE *atype; | 139 | ASN1_TYPE *atype; |
| 140 | if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL; | 140 | if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL; |
| 141 | if (atype->type != V_ASN1_BMPSTRING) return NULL; | 141 | if (atype->type != V_ASN1_BMPSTRING) return NULL; |
| 142 | return uni2asc(atype->value.bmpstring->data, | 142 | return OPENSSL_uni2asc(atype->value.bmpstring->data, |
| 143 | atype->value.bmpstring->length); | 143 | atype->value.bmpstring->length); |
| 144 | } | 144 | } |
| 145 | 145 | ||