diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/common/net/wanboot/p12misc.c | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/common/net/wanboot/p12misc.c')
| -rw-r--r-- | usr/src/common/net/wanboot/p12misc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/common/net/wanboot/p12misc.c b/usr/src/common/net/wanboot/p12misc.c index b8a4dfb3a2..23c9106da1 100644 --- a/usr/src/common/net/wanboot/p12misc.c +++ b/usr/src/common/net/wanboot/p12misc.c @@ -58,6 +58,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2012, OmniTI Computer Consulting, Inc. All rights reserved. + */ + #pragma ident "%Z%%M% %I% %E% SMI" #include <stdio.h> @@ -440,7 +444,11 @@ sunw_get_pkey_fname(getdo_actions_t dowhat, EVP_PKEY *pkey, char **fname) } str = ty->value.bmpstring; +#if OPENSSL_VERSION_NUMBER < 0x10000000L *fname = uni2asc(str->data, str->length); +#else + *fname = OPENSSL_uni2asc(str->data, str->length); +#endif if (*fname == NULL) { SUNWerr(SUNW_F_GET_PKEY_FNAME, SUNW_R_MEMORY_FAILURE); return (-1); |