diff options
| author | Pauli <paul.dale@oracle.com> | 2020-08-19 13:57:00 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-08-20 16:07:10 +1000 |
| commit | 3b1fd0b003572554ad9bb3914527c160bc6a7727 (patch) | |
| tree | 6bc57edc7eb75f1978c37354fbceeb2ffc6a1974 /apps/cmp.c | |
| parent | ffcdb24b13590190e92c7f88e2ad3e0a721408f2 (diff) | |
cmp: handle error return from OBJ_obj2txt()
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12678)
Diffstat (limited to 'apps/cmp.c')
| -rw-r--r-- | apps/cmp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index f0b3148714..b2afbf64e8 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -2241,7 +2241,7 @@ static void print_itavs(STACK_OF(OSSL_CMP_ITAV) *itavs) { OSSL_CMP_ITAV *itav = NULL; char buf[128]; - int i; + int i, r; int n = sk_OSSL_CMP_ITAV_num(itavs); /* itavs == NULL leads to 0 */ if (n == 0) { @@ -2251,8 +2251,13 @@ static void print_itavs(STACK_OF(OSSL_CMP_ITAV) *itavs) for (i = 0; i < n; i++) { itav = sk_OSSL_CMP_ITAV_value(itavs, i); - OBJ_obj2txt(buf, 128, OSSL_CMP_ITAV_get0_type(itav), 0); - CMP_info1("genp contains ITAV of type: %s", buf); + r = OBJ_obj2txt(buf, 128, OSSL_CMP_ITAV_get0_type(itav), 0); + if (r < 0) + CMP_err("could not get ITAV details"); + else if (r == 0) + CMP_info("genp contains empty ITAV"); + else + CMP_info1("genp contains ITAV of type: %s", buf); } } |