From ff1445a08c55bf52b1b3e2baac53fe5d77137f27 Mon Sep 17 00:00:00 2001
From: Kevin Lin <klin@sourcefire.com>
Date: Mon, 6 Oct 2014 19:03:24 -0400
Subject: [PATCH] bb#11135 - sigtool now verifies cvd prior to unpacking

---
 sigtool/sigtool.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 8f1970147..f2135c210 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1125,6 +1125,11 @@ static int unpack(const struct optstruct *opts)
 	name[sizeof(name)-1]='\0';
     }
 
+    if (cl_cvdverify(name) != CL_SUCCESS) {
+        mprintf("!unpack: %s is not a valid CVD\n", name);
+        return -1;
+    }
+
     if(cli_cvdunpack(name, ".") == -1) {
 	mprintf("!unpack: Can't unpack file %s\n", name);
 	return -1;