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/boot_http.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/boot_http.c')
| -rw-r--r-- | usr/src/common/net/wanboot/boot_http.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/src/common/net/wanboot/boot_http.c b/usr/src/common/net/wanboot/boot_http.c index 3909d08714..737f49a8aa 100644 --- a/usr/src/common/net/wanboot/boot_http.c +++ b/usr/src/common/net/wanboot/boot_http.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, OmniTI Computer Consulting, Inc. All rights reserved. */ #include <errno.h> @@ -1767,7 +1768,11 @@ password_cb(char *buf, int buflen, int rwflag, void *userdata) static SSL_CTX * initialize_ctx(http_conn_t *c_id) { +#if OPENSSL_VERSION_NUMBER < 0x10000000L SSL_METHOD *meth; +#else + const SSL_METHOD *meth; +#endif SSL_CTX *ctx; ERR_clear_error(); |