Merge branch 'moosa-1.0' into moosa-2.0

terrafrost · terrafrost · commit f95b039d08d6 · 2021-04-03T18:17:27.000-05:00
diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
@@ -3044,7 +3044,9 @@ function _rsassa_pkcs1_v1_5_verify($m, $s)
         }
 
         // Compare
-        return $this->_equals($em, $em2) || $this->_equals($em, $em3);
+
+        return ($em2 !== false && $this->_equals($em, $em2)) ||
+               ($em3 !== false && $this->_equals($em, $em3));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -3044,7 +3044,9 @@ function _rsassa_pkcs1_v1_5_verify($m, $s)`
`3044`	`3044`	`}`
`3045`	`3045`
`3046`	`3046`	`// Compare`
`3047`		`- return $this->_equals($em, $em2) \|\| $this->_equals($em, $em3);`
	`3047`	`+`
	`3048`	`+ return ($em2 !== false && $this->_equals($em, $em2)) \|\|`
	`3049`	`+ ($em3 !== false && $this->_equals($em, $em3));`
`3048`	`3050`	`}`
`3049`	`3051`
`3050`	`3052`	`/**`