Skip to content

Commit

Permalink
Update to Auth_SASL 1.0.5 and its new IANA names.
Browse files Browse the repository at this point in the history
This latest version of the Auth_SASL package unfortunately introduces
deprecation warnings for the "old" mechanism names, so the only way we can
support this cleanly is to switch to the new names and raise the minimum
required Auth_SASL package version to 1.0.5.

Request: 18837
  • Loading branch information
jparise committed Sep 19, 2011
1 parent 8c94491 commit 9ada985
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions SMTP.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ function _authDigest_MD5($uid, $pwd, $authz = '')
} }


$challenge = base64_decode($this->_arguments[0]); $challenge = base64_decode($this->_arguments[0]);
$digest = &Auth_SASL::factory('digestmd5'); $digest = &Auth_SASL::factory('digest-md5');
$auth_str = base64_encode($digest->getResponse($uid, $pwd, $challenge, $auth_str = base64_encode($digest->getResponse($uid, $pwd, $challenge,
$this->host, "smtp", $this->host, "smtp",
$authz)); $authz));
Expand Down Expand Up @@ -779,7 +779,7 @@ function _authCRAM_MD5($uid, $pwd, $authz = '')
} }


$challenge = base64_decode($this->_arguments[0]); $challenge = base64_decode($this->_arguments[0]);
$cram = &Auth_SASL::factory('crammd5'); $cram = &Auth_SASL::factory('cram-md5');
$auth_str = base64_encode($cram->getResponse($uid, $pwd, $challenge)); $auth_str = base64_encode($cram->getResponse($uid, $pwd, $challenge));


if (PEAR::isError($error = $this->_put($auth_str))) { if (PEAR::isError($error = $this->_put($auth_str))) {
Expand Down
5 changes: 3 additions & 2 deletions package.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<date>2011-08-13</date> <date>2011-08-13</date>
<time>10:00:00</time> <time>10:00:00</time>
<version> <version>
<release>1.6.1</release> <release>1.6.2</release>
<api>1.2.0</api> <api>1.2.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
<api>stable</api> <api>stable</api>
</stability> </stability>
<license uri="http://www.php.net/license/3_01.txt">PHP License</license> <license uri="http://www.php.net/license/3_01.txt">PHP License</license>
<notes>- Fixing the detection of SASL-based AUTH methods. (Bug #18594) <notes>- Update to Auth_SASL 1.0.5 and its new IANA names. (Request 18837)
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="Net" name="/"> <dir baseinstalldir="Net" name="/">
Expand Down Expand Up @@ -67,6 +67,7 @@
<package> <package>
<name>Auth_SASL</name> <name>Auth_SASL</name>
<channel>pear.php.net</channel> <channel>pear.php.net</channel>
<min>1.0.5</min>
</package> </package>
</optional> </optional>
</dependencies> </dependencies>
Expand Down

0 comments on commit 9ada985

Please sign in to comment.