From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 12 Jun 2016 22:22:30 +0000 (+0100)
Subject: Fix link error.
X-Git-Tag: OpenSSL_1_0_2i~149
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ccd582c2f1bd3bea1423a0205692dc2e358ace51;p=oweals%2Fopenssl.git

Fix link error.

Use string_to_hex, OPENSSL_hexstr2buf() doesn't exist in OpenSSL 1.0.2

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 80cbd94a5f..951a202771 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -267,7 +267,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
                    ret);
 
     /* convert the PSK key to binary */
-    key = OPENSSL_hexstr2buf(psk_key, &key_len);
+    key = string_to_hex(psk_key, &key_len);
     if (key == NULL) {
         BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
                    psk_key);
diff --git a/apps/s_server.c b/apps/s_server.c
index ceacd898cc..d6c53d9476 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -376,7 +376,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
         BIO_printf(bio_s_out, "PSK client identity found\n");
 
     /* convert the PSK key to binary */
-    key = OPENSSL_hexstr2buf(psk_key, &key_len);
+    key = string_to_hex(psk_key, &key_len);
     if (key == NULL) {
         BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
                    psk_key);