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/auxutil.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/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); } |