[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  ccd582c2f1bd3bea1423a0205692dc2e358ace51 (commit)
      from  6397ac585d6d4101be0fb742ac0db5074bd4e8a6 (commit)


- Log -----------------------------------------------------------------
commit ccd582c2f1bd3bea1423a0205692dc2e358ace51
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun Jun 12 23:22:30 2016 +0100

    Fix link error.
    
    Use string_to_hex, OPENSSL_hexstr2buf() doesn't exist in OpenSSL 1.0.2
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 2 +-
 apps/s_server.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 80cbd94..951a202 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 ceacd89..d6c53d9 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);