@@ -545,13 +545,10 @@ func TestSignAndVerifyHMAC(t *testing.T) {
545545 if err != nil {
546546 t .Errorf ("could not generate verifier: %s" , err )
547547 }
548- verified , err : = VerifyRequest (signatureName , * verifier , req )
548+ err = VerifyRequest (signatureName , * verifier , req )
549549 if err != nil {
550550 t .Errorf ("verification error: %s" , err )
551551 }
552- if ! verified {
553- t .Errorf ("message did not pass verification" )
554- }
555552}
556553
557554func TestCreated (t * testing.T ) {
@@ -571,7 +568,7 @@ func TestCreated(t *testing.T) {
571568 if err != nil {
572569 t .Errorf ("could not generate verifier: %s" , err )
573570 }
574- _ , err = VerifyResponse (signatureName , * verifier , res2 )
571+ err = VerifyResponse (signatureName , * verifier , res2 )
575572 if wantSuccess && err != nil {
576573 t .Errorf ("verification error: %s" , err )
577574 }
@@ -603,13 +600,10 @@ func TestSignAndVerifyResponseHMAC(t *testing.T) {
603600 if err != nil {
604601 t .Errorf ("could not generate verifier: %s" , err )
605602 }
606- verified , err : = VerifyResponse (signatureName , * verifier , res2 )
603+ err = VerifyResponse (signatureName , * verifier , res2 )
607604 if err != nil {
608605 t .Errorf ("verification error: %s" , err )
609606 }
610- if ! verified {
611- t .Errorf ("message did not pass verification" )
612- }
613607}
614608
615609func TestSignAndVerifyRSAPSS (t * testing.T ) {
@@ -633,13 +627,10 @@ func TestSignAndVerifyRSAPSS(t *testing.T) {
633627 if err != nil {
634628 t .Errorf ("could not generate verifier: %s" , err )
635629 }
636- verified , err : = VerifyRequest (signatureName , * verifier , req )
630+ err = VerifyRequest (signatureName , * verifier , req )
637631 if err != nil {
638632 t .Errorf ("verification error: %s" , err )
639633 }
640- if ! verified {
641- t .Errorf ("message did not pass verification" )
642- }
643634}
644635
645636func TestSignAndVerifyRSA (t * testing.T ) {
@@ -663,13 +654,10 @@ func TestSignAndVerifyRSA(t *testing.T) {
663654 if err != nil {
664655 t .Errorf ("could not generate verifier: %s" , err )
665656 }
666- verified , err : = VerifyRequest (signatureName , * verifier , req )
657+ err = VerifyRequest (signatureName , * verifier , req )
667658 if err != nil {
668659 t .Errorf ("verification error: %s" , err )
669660 }
670- if ! verified {
671- t .Errorf ("message did not pass verification" )
672- }
673661}
674662
675663func TestSignAndVerifyP256 (t * testing.T ) {
@@ -696,13 +684,10 @@ func TestSignAndVerifyP256(t *testing.T) {
696684 if err != nil {
697685 t .Errorf ("could not generate verifier: %s" , err )
698686 }
699- verified , err : = VerifyRequest (signatureName , * verifier , req )
687+ err = VerifyRequest (signatureName , * verifier , req )
700688 if err != nil {
701689 t .Errorf ("verification error: %s" , err )
702690 }
703- if ! verified {
704- t .Errorf ("message did not pass verification" )
705- }
706691}
707692
708693func TestSignResponse (t * testing.T ) {
@@ -779,8 +764,8 @@ Signature: sig77=:3e9KqLP62NHfHY5OMG4036+U6tvBowZF35ALzTjpsf0=:
779764
780765`
781766 req , _ := http .ReadRequest (bufio .NewReader (strings .NewReader (reqStr )))
782- verified , _ := VerifyRequest ("sig77" , * verifier , req )
783- fmt .Printf ("verified: %t" , verified )
767+ err := VerifyRequest ("sig77" , * verifier , req )
768+ fmt .Printf ("verified: %t" , err == nil )
784769 // Output: verified: true
785770}
786771
@@ -880,14 +865,11 @@ func TestVerifyRequest(t *testing.T) {
880865 }
881866 for _ , tt := range tests {
882867 t .Run (tt .name , func (t * testing.T ) {
883- got , err := VerifyRequest (tt .args .signatureName , tt .args .verifier , tt .args .req )
868+ err := VerifyRequest (tt .args .signatureName , tt .args .verifier , tt .args .req )
884869 if (err != nil ) != tt .wantErr {
885870 t .Errorf ("VerifyRequest() error = %v, wantErr %v" , err , tt .wantErr )
886871 return
887872 }
888- if got != tt .want {
889- t .Errorf ("VerifyRequest() got = %v, want %v" , got , tt .want )
890- }
891873 })
892874 }
893875}
0 commit comments