diff options
author | Brion Vibber <brion@pobox.com> | 2010-07-19 16:47:49 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-07-19 16:47:49 -0700 |
commit | f0620a74c8a1a25ceb957819e528ef5a7d044d6e (patch) | |
tree | 086ff00c6e4471d3cfc03b1bf884b164e28e52bb /extlib/Auth/OpenID/Association.php | |
parent | d51820adc52aef962542ecc6da0607ce0118fefc (diff) |
Provisional OAuth, OpenID token check timing attack patches
Diffstat (limited to 'extlib/Auth/OpenID/Association.php')
-rw-r--r-- | extlib/Auth/OpenID/Association.php | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/extlib/Auth/OpenID/Association.php b/extlib/Auth/OpenID/Association.php index d1ac1ed9b..7fdf399a3 100644 --- a/extlib/Auth/OpenID/Association.php +++ b/extlib/Auth/OpenID/Association.php @@ -374,7 +374,42 @@ class Auth_OpenID_Association { } $calculated_sig = $this->getMessageSignature($message); - return $calculated_sig == $sig; + + return $this->constantTimeCompare($calculated_sig, $sig); + } + + /** + * String comparison function which will complete in a constant time + * for strings of any given matching length, to help prevent an attacker + * from distinguishing how much of a signature token they have guessed + * correctly. + * + * For this usage, it's assumed that the length of the string is known, + * so we may safely short-circuit on mismatched lengths which will be known + * to be invalid by the attacker. + * + * http://lists.openid.net/pipermail/openid-security/2010-July/001156.html + * http://rdist.root.org/2010/01/07/timing-independent-array-comparison/ + */ + private function constantTimeCompare($a, $b) + { + $len = strlen($a); + if (strlen($b) !== $len) { + // Short-circuit on length mismatch; attackers will already know + // the correct target length so this is safe. + return false; + } + if ($len == 0) { + // 0-length valid input shouldn't really happen. :) + return true; + } + $result = 0; + for ($i = 0; $i < strlen($a); $i++) { + // We use scary bitwise operations to avoid logical short-circuits + // in lower-level code. + $result |= ord($a{$i}) ^ ord($b{$i}); + } + return ($result == 0); } } |