diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-08-12 13:52:53 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-15 22:12:25 +0200 |
| commit | 810a1d0320fa1706c722d1cfcae398bfb8219837 (patch) | |
| tree | 8e8b9b395dd531865a6a19263ee66c5890375de6 /crypto/params_from_text.c | |
| parent | f73eb733eeeb50df0068d01efaa3221cadb07389 (diff) | |
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)
Diffstat (limited to 'crypto/params_from_text.c')
| -rw-r--r-- | crypto/params_from_text.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |