Merge pull request #3 from joerivanruth/mapihandshake

bolner · web-flow · commit b463196a740f · 2021-10-16T00:06:28.000+02:00
Ignore additional MAPI challenge fields instead of raising an error
diff --git a/src/ServerChallenge.php b/src/ServerChallenge.php
@@ -77,9 +77,9 @@ function __construct(string $challengeLine)
     {
         $parts = explode(':', $challengeLine);
         $count = count($parts) - 1;     	// Last is always empty
-        if ($count != 6) {
+        if ($count < 6) {
             throw new MonetException("Received invalid 'server challenge' string from the server. It"
-                ." contains {$count} fields, instead of 6.");
+                ." contains {$count} fields, should be at least 6.");
         }
 
         $this->salt = trim($parts[0]);

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ function __construct(string $challengeLine)`
`77`	`77`	`{`
`78`	`78`	`$parts = explode(':', $challengeLine);`
`79`	`79`	`$count = count($parts) - 1; // Last is always empty`
`80`		`- if ($count != 6) {`
	`80`	`+ if ($count < 6) {`
`81`	`81`	`throw new MonetException("Received invalid 'server challenge' string from the server. It"`
`82`		`- ." contains {$count} fields, instead of 6.");`
	`82`	`+ ." contains {$count} fields, should be at least 6.");`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$this->salt = trim($parts[0]);`