[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  e10aeee104383b711a6a58a13ed172fdb8642340 (commit)
       via  5e3553c2de9a365479324b8ba8b998f0cce3e527 (commit)
      from  85afea67f5e48dc4f02ac100454ec3caa41aa647 (commit)


- Log -----------------------------------------------------------------
commit e10aeee104383b711a6a58a13ed172fdb8642340
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Jul 16 13:41:33 2016 +0200

    fuzzers: print and convert it back
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #1323

commit 5e3553c2de9a365479324b8ba8b998f0cce3e527
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Jul 16 16:56:54 2016 +0200

    Return error when trying to print invalid ASN1 integer
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    GH: #1322

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

Summary of changes:
 crypto/asn1/tasn_prn.c |  2 ++
 fuzz/asn1.c            | 24 +++++++++++++++++++++++-
 fuzz/ct.c              | 12 +++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 9f4c81e..930ef97 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -393,6 +393,8 @@ static int asn1_print_integer(BIO *out, ASN1_INTEGER *str)
     char *s;
     int ret = 1;
     s = i2s_ASN1_INTEGER(NULL, str);
+    if (s == NULL)
+        return 0;
     if (BIO_puts(out, s) <= 0)
         ret = 0;
     OPENSSL_free(s);
diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 5d871cd..4d5a726 100644
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -69,11 +69,33 @@ int FuzzerInitialize(int *argc, char ***argv) {
 int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     int n;
 
+    ASN1_PCTX *pctx = ASN1_PCTX_new();
+
+    ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT |
+        ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF |
+        ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
+    ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT |
+        ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
+
     for (n = 0; item_type[n] != NULL; ++n) {
         const uint8_t *b = buf;
+        unsigned char *der = NULL;
         const ASN1_ITEM *i = ASN1_ITEM_ptr(item_type[n]);
         ASN1_VALUE *o = ASN1_item_d2i(NULL, &b, len, i);
-        ASN1_item_free(o, i);
+
+        if (o != NULL) {
+            BIO *bio = BIO_new(BIO_s_null());
+            ASN1_item_print(bio, o, 4, i, pctx);
+            BIO_free(bio);
+
+            ASN1_item_i2d(o, &der, i);
+            OPENSSL_free(der);
+
+            ASN1_item_free(o, i);
+        }
     }
+
+    ASN1_PCTX_free(pctx);
+
     return 0;
 }
diff --git a/fuzz/ct.c b/fuzz/ct.c
index 5dc47f1..0abcd8a 100644
--- a/fuzz/ct.c
+++ b/fuzz/ct.c
@@ -22,7 +22,17 @@ int FuzzerInitialize(int *argc, char ***argv) {
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     const uint8_t **pp = &buf;
+    unsigned char *der = NULL;
     STACK_OF(SCT) *scts = d2i_SCT_LIST(NULL, pp, len);
-    SCT_LIST_free(scts);
+    if (scts != NULL) {
+        BIO *bio = BIO_new(BIO_s_null());
+        SCT_LIST_print(scts, bio, 4, "\n", NULL);
+        BIO_free(bio);
+
+        i2d_SCT_LIST(scts, &der);
+        OPENSSL_free(der);
+
+        SCT_LIST_free(scts);
+    }
     return 0;
 }