From eaa47cac54d14ef4d4714c248d6340957a89056d Mon Sep 17 00:00:00 2001
From: Paul van Brouwershaven <paul.vanbrouwershaven@digitorus.com>
Date: Fri, 18 May 2018 11:21:34 +0200
Subject: [PATCH] verify.Verify to verify.File, err format

---
 sign.go           |  2 +-
 sign/sign_test.go |  6 +++---
 verify/verify.go  | 12 ++++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sign.go b/sign.go
index ecb9a39..d4b2e58 100644
--- a/sign.go
+++ b/sign.go
@@ -44,7 +44,7 @@ func main() {
 		}
 		defer input_file.Close()
 
-		resp, err := verify.Verify(input_file)
+		resp, err := verify.File(input_file)
 		log.Println(resp)
 		if err != nil {
 			log.Println(err)
diff --git a/sign/sign_test.go b/sign/sign_test.go
index 94bfdde..e1771e5 100644
--- a/sign/sign_test.go
+++ b/sign/sign_test.go
@@ -157,7 +157,7 @@ func TestSignPDF(t *testing.T) {
 			finfo, err := input_file.Stat()
 			if err != nil {
 				input_file.Close()
-				st.Error("%s: %s", f.Name(), err.Error())
+				st.Errorf("%s: %s", f.Name(), err.Error())
 				return
 			}
 			size := finfo.Size()
@@ -200,7 +200,7 @@ func TestSignPDF(t *testing.T) {
 				return
 			}
 
-			_, err = verify.Verify(outputFile)
+			_, err = verify.File(outputFile)
 			input_file.Close()
 			if err != nil {
 				err2 := os.Rename(outputFile.Name(), "../testfiles/failed/"+filepath.Base(input_file.Name()))
@@ -268,7 +268,7 @@ func TestSignPDFFile(t *testing.T) {
 		return
 	}
 
-	_, err = verify.Verify(tmpfile)
+	_, err = verify.File(tmpfile)
 	os.Remove(tmpfile.Name())
 
 	if err != nil {
diff --git a/verify/verify.go b/verify/verify.go
index 59a5771..c517e20 100644
--- a/verify/verify.go
+++ b/verify/verify.go
@@ -8,17 +8,15 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"os"
-	"runtime/debug"
 	"time"
 
-	"crypto"
-
 	"bitbucket.org/digitorus/pdf"
 	"bitbucket.org/digitorus/pdfsign/revocation"
+
 	"github.com/digitorus/pkcs7"
 	"github.com/digitorus/timestamp"
+
 	"golang.org/x/crypto/ocsp"
 )
 
@@ -59,7 +57,6 @@ func File(file *os.File) (apiResp *Response, err error) {
 
 func Reader(file io.ReaderAt, size int64) (apiResp *Response, err error) {
 	defer func() {
-		log.Printf("%s\n", debug.Stack())
 		if r := recover(); r != nil {
 			apiResp = nil
 			err = fmt.Errorf("Failed to verify file (%v)", r)
@@ -192,11 +189,10 @@ func Reader(file io.ReaderAt, size int64) (apiResp *Response, err error) {
 			if err == nil {
 				signer.ValidSignature = true
 				signer.TrustedIssuer = false
+			} else {
+				apiResp.Error = fmt.Sprintln("Failed to verify signature:", err)
 			}
-			//log.Println("Invalid sig")
-			apiResp.Error = fmt.Sprintln("Failed to verify signature:", err)
 		} else {
-			//log.Println("Valid sig")
 			signer.ValidSignature = true
 			signer.TrustedIssuer = true
 		}