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/auxutil.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/auxutil.c')
| -rw-r--r-- | usr/src/common/net/wanboot/auxutil.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/common/net/wanboot/auxutil.c b/usr/src/common/net/wanboot/auxutil.c index 0236776105..b7ea152efb 100644 --- a/usr/src/common/net/wanboot/auxutil.c +++ b/usr/src/common/net/wanboot/auxutil.c @@ -61,6 +61,10 @@ * in this library. None of these are exposed. */ +/* + * Copyright (c) 2012, OmniTI Computer Consulting, Inc. All rights reserved. + */ + #pragma ident "%Z%%M% %I% %E% SMI" #include <stdio.h> @@ -97,7 +101,11 @@ asc2bmpstring(const char *str, int len) int unilen; /* Convert the character to the bmp format. */ +#if OPENSSL_VERSION_NUMBER < 0x10000000L if (asc2uni(str, len, &uni, &unilen) == 0) { +#else + if (OPENSSL_asc2uni(str, len, &uni, &unilen) == 0) { +#endif SUNWerr(SUNW_F_ASC2BMPSTRING, SUNW_R_MEMORY_FAILURE); return (NULL); } |