RSA: fix for PHP8

terrafrost · terrafrost · commit 149b4d213131 · 2021-04-03T18:16:59.000-05:00
diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
@@ -3128,7 +3128,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
`@@ -3128,7 +3128,9 @@ function _rsassa_pkcs1_v1_5_verify($m, $s)`
`3128`	`3128`	`}`
`3129`	`3129`
`3130`	`3130`	`// Compare`
`3131`		`- return $this->_equals($em, $em2) \|\| $this->_equals($em, $em3);`
	`3131`	`+`
	`3132`	`+ return ($em2 !== false && $this->_equals($em, $em2)) \|\|`
	`3133`	`+ ($em3 !== false && $this->_equals($em, $em3));`
`3132`	`3134`	`}`
`3133`	`3135`
`3134`	`3136`	`/**`