From 810a1d0320fa1706c722d1cfcae398bfb8219837 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 12 Aug 2019 13:52:53 +0200
Subject: [PATCH] OSSL_PARAM_construct_from_text(): handle non-hex octet string
 input

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8877)
---
 crypto/params_from_text.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/params_from_text.c b/crypto/params_from_text.c
index 2a861c94fe..72770ddc53 100644
--- a/crypto/params_from_text.c
+++ b/crypto/params_from_text.c
@@ -91,6 +91,8 @@ static int prepare_from_text(const OSSL_PARAM *paramdefs, const char *key,
     case OSSL_PARAM_OCTET_STRING:
         if (*ishex) {
             *buf_n = strlen(value) >> 1;
+        } else {
+            *buf_n = value_n;
         }
         break;
     }
-- 
2.25.1