diff options
| author | Theo Schlossnagle <jesus@omniti.com> | 2012-04-24 22:00:12 -0400 |
|---|---|---|
| committer | Theo Schlossnagle <jesus@omniti.com> | 2012-04-24 22:00:12 -0400 |
| commit | 70f9559bd0c02885d84a425eaafc8c280df10efb (patch) | |
| tree | 8e941ecc2999c6850276e61ac528dabfa5ff920f /usr/src/common/net/wanboot/p12misc.c | |
| parent | d0bf2cb9f5d040c9eb24954ea34580b402377300 (diff) | |
| download | illumos-gate-70f9559bd0c02885d84a425eaafc8c280df10efb.tar.gz | |
1665 Illumos wont build against openssl 1.0.0
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Albert Lee <trisk@nexenta.com>
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); |