CMS fuzzer: also use id2

[openssl.git] / fuzz / cms.c

diff --git a/fuzz/cms.c b/fuzz/cms.c
index f97173add354f77fda7953f257523dd02b4c919a..b57a6de96a63112cce7bc63e257771a437fb6594 100644 (file)
--- a/fuzz/cms.c
+++ b/fuzz/cms.c
@@ -16,17 +16,35 @@
 #include <openssl/cms.h>
 #include "fuzzer.h"
 
-int FuzzerInitialize(int *argc, char ***argv) {
+int FuzzerInitialize(int *argc, char ***argv)
+{
     return 1;
 }
 
-int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
-    CMS_ContentInfo *i;
-    BIO *in = BIO_new(BIO_s_mem());
+int FuzzerTestOneInput(const uint8_t *buf, size_t len)
+{
+    CMS_ContentInfo *cms;
+    BIO *in;
 
+    if (len == 0)
+        return 0;
+
+    in = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(in, buf, len) == len);
-    i = d2i_CMS_bio(in, NULL);
-    CMS_ContentInfo_free(i);
+    cms = d2i_CMS_bio(in, NULL);
+    if (cms != NULL) {
+        BIO *out = BIO_new(BIO_s_null());
+
+        i2d_CMS_bio(out, cms);
+        BIO_free(out);
+        CMS_ContentInfo_free(cms);
+    }
+
     BIO_free(in);
+
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}