diff -Nru php-radius-1.2.7/debian/changelog php-radius-1.4.0~b1/debian/changelog
--- php-radius-1.2.7/debian/changelog	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/debian/changelog	2016-04-04 19:51:15.000000000 +0000
@@ -1,3 +1,10 @@
+php-radius (1.4.0~b1-0ubuntu1) xenial; urgency=medium
+
+  * New upstream release (LP: #1565010).
+  * Update watch file for beta release. 
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Mon, 04 Apr 2016 12:26:08 -0700
+
 php-radius (1.2.7-2) unstable; urgency=medium
 
   * Fix typo in git URL
diff -Nru php-radius-1.2.7/debian/control php-radius-1.4.0~b1/debian/control
--- php-radius-1.2.7/debian/control	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/debian/control	2016-04-04 19:51:15.000000000 +0000
@@ -1,12 +1,13 @@
 Source: php-radius
 Section: web
 Priority: optional
-Maintainer: Debian PHP PECL Maintainers <pkg-php-pecl@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP PECL Maintainers <pkg-php-pecl@lists.alioth.debian.org>
 Uploaders: Ondřej Surý <ondrej@debian.org>,
            Roberto Lumbreras <rover@debian.org>
 Build-Depends: debhelper (>= 9),
-               dh-php5,
-               php5-dev,
+               dh-php,
+               php-dev,
                pkg-php-tools (>= 1.5~),
                po-debconf
 Standards-Version: 3.9.6
@@ -14,7 +15,7 @@
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-php/php-radius.git;a=summary
 Homepage: http://pecl.php.net/package/radius
 
-Package: php5-radius
+Package: php-radius
 Architecture: any
 Depends: ${misc:Depends},
          ${php:Depends},
diff -Nru php-radius-1.2.7/debian/php5-radius.examples php-radius-1.4.0~b1/debian/php5-radius.examples
--- php-radius-1.2.7/debian/php5-radius.examples	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/debian/php5-radius.examples	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-radius-*/examples/*
diff -Nru php-radius-1.2.7/debian/php5-radius.php5 php-radius-1.4.0~b1/debian/php5-radius.php5
--- php-radius-1.2.7/debian/php5-radius.php5	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/debian/php5-radius.php5	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-mod debian/radius.ini
diff -Nru php-radius-1.2.7/debian/php-radius.php php-radius-1.4.0~b1/debian/php-radius.php
--- php-radius-1.2.7/debian/php-radius.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/debian/php-radius.php	2016-04-04 19:51:15.000000000 +0000
@@ -0,0 +1 @@
+mod debian/radius.ini
diff -Nru php-radius-1.2.7/debian/rules php-radius-1.4.0~b1/debian/rules
--- php-radius-1.2.7/debian/rules	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/debian/rules	2016-04-04 19:51:15.000000000 +0000
@@ -4,4 +4,4 @@
 export NO_INTERACTION=1
 
 %:
-	dh $@ --buildsystem=phppear --with phppear --with php5
+	dh $@ --buildsystem=phppear --with phppear --with php
diff -Nru php-radius-1.2.7/package.xml php-radius-1.4.0~b1/package.xml
--- php-radius-1.2.7/package.xml	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/package.xml	2016-02-15 15:11:50.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
  <name>radius</name>
  <channel>pecl.php.net</channel>
  <summary>Radius client library</summary>
@@ -19,24 +19,20 @@
   <email>aharvey@php.net</email>
   <active>yes</active>
  </lead>
- <date>2013-06-27</date>
- <time>21:14:24</time>
+ <date>2016-02-15</date>
+ <time>15:11:50</time>
  <version>
-  <release>1.2.7</release>
-  <api>1.2.7</api>
+  <release>1.4.0b1</release>
+  <api>1.4.0b1</api>
  </version>
  <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
  <notes>
-This release fixes a security issue in radius_get_vendor_attr(). It is strongly
-recommended that users using vendor specific attributes upgrade immediately,
-with other users encouraged to upgrade when practical.
-
-- Fix a security issue in radius_get_vendor_attr() by enforcing checks of the
-  VSA length field against the buffer size. (Adam)
+- Add PHP 7.0 support. (Adam)
+- Drop support for PHP &lt; 5.3.
  </notes>
  <contents>
   <dir name="/">
@@ -45,44 +41,71 @@
    <file md5sum="e237b87a64f1b47ac3b7efb1fe836280" name="examples/mschaptest.php" role="doc" />
    <file md5sum="f17f9a4ec3f19e1eca79b02c7412aef8" name="examples/radius-acct.php" role="doc" />
    <file md5sum="5406af0402f693082e729167300a7700" name="examples/radius-auth.php" role="doc" />
-   <file md5sum="1e5cb9850dfbb87ebea3beed547ddffa" name="tests/server/fake_server.php" role="test" />
+   <file md5sum="86285d20163dd259ed7823d8fac9dfe4" name="pecl-compat/src/misc.h" role="src" />
+   <file md5sum="bd2b4fe3b4c053a338a24efb66a37a18" name="pecl-compat/src/zend_API.h" role="src" />
+   <file md5sum="e78c79ee5dfe4622879debc788923a2b" name="pecl-compat/src/zend_hash.h" role="src" />
+   <file md5sum="61244e4767158ab5559888a1ace59caf" name="pecl-compat/src/zend_resource.h" role="src" />
+   <file md5sum="4964d5e75b79e45810cb5e3af061f70c" name="pecl-compat/src/zend_string.h" role="src" />
+   <file md5sum="4ca10b620178ce5619fdb2985e99ebc9" name="pecl-compat/compat.h" role="src" />
+   <file md5sum="2df3b9f9a4750e44c0063e90916ea745" name="tests/server/attribute.php" role="test" />
+   <file md5sum="2c80246c2caaa10c3996220e7fc8f375" name="tests/server/fake_server.php" role="test" />
+   <file md5sum="21ef8d92199a91103fe752d72fa99eb1" name="tests/server/vsa.php" role="test" />
+   <file md5sum="48b924771a69fd92f46273fcae8fd187" name="tests/coa.phpt" role="test" />
+   <file md5sum="a9c62a0245dda571c869b3c87371d983" name="tests/disconnect.phpt" role="test" />
    <file md5sum="d81a22d057602b283cf6f2fd659f3a98" name="tests/radius_acct_open.phpt" role="test" />
    <file md5sum="aa16a8ae9502fdb61232da918cf7859c" name="tests/radius_auth_open.phpt" role="test" />
    <file md5sum="dbb9a3ec2f437cc7232ac365c9217a73" name="tests/radius_close.phpt" role="test" />
-   <file md5sum="9f7356ecd45ff9703e4e9e698b9e1fa7" name="tests/radius_cvt_addr.phpt" role="test" />
-   <file md5sum="f3a786f6b11f24951d801ff0635129b0" name="tests/radius_cvt_int.phpt" role="test" />
-   <file md5sum="06c536aa1ee5e2200b21b56241af8df9" name="tests/radius_cvt_string.phpt" role="test" />
-   <file md5sum="f3de6a009a87baa246bbea756d2141a4" name="tests/radius_get_attr.phpt" role="test" />
-   <file md5sum="61c7abbe5ad4fbafb2e20f41345d2bc6" name="tests/radius_get_vendor_attr.phpt" role="test" />
-   <file md5sum="1c01fbc3f2b496606eeae91aace92526" name="tests/radius_put_addr.phpt" role="test" />
-   <file md5sum="d3bf887c072c3c32c2c0d65540a8a6fa" name="tests/radius_put_attr.phpt" role="test" />
-   <file md5sum="45207d473fd546c2b34287f573887fe6" name="tests/radius_put_int.phpt" role="test" />
-   <file md5sum="8b3f42cec544b175f218530debbf37b4" name="tests/radius_put_string.phpt" role="test" />
-   <file md5sum="a39bc5b4464f8503db16a551090ad31d" name="tests/radius_request_authenticator.phpt" role="test" />
+   <file md5sum="e31938e300c2670c9e2aedac192c3a43" name="tests/radius_cvt_addr.phpt" role="test" />
+   <file md5sum="9184b60a4367cfb91a206ffb7939328d" name="tests/radius_cvt_int.phpt" role="test" />
+   <file md5sum="504aa4580902bb81e94cbed1038c47ed" name="tests/radius_cvt_string.phpt" role="test" />
+   <file md5sum="469b8ce2aee8ac9b07a802e59297999b" name="tests/radius_get_attr.phpt" role="test" />
+   <file md5sum="9727b3f06d433e9e63e5b00e2d17e3ef" name="tests/radius_get_tagged_attr_data.phpt" role="test" />
+   <file md5sum="5af511f6ef450ea3b9cde12b45bd7ee9" name="tests/radius_get_tagged_attr_tag.phpt" role="test" />
+   <file md5sum="f4d9102f9e1c27566672a034f935664e" name="tests/radius_get_vendor_attr.phpt" role="test" />
+   <file md5sum="aa9ab53597e7f6143c9743a70ffd805f" name="tests/radius_put_addr.phpt" role="test" />
+   <file md5sum="3c155f522fd329a5cc03b8a7bb768bb6" name="tests/radius_put_addr_tag.phpt" role="test" />
+   <file md5sum="0187d47b7284056167871e72b879699e" name="tests/radius_put_attr.phpt" role="test" />
+   <file md5sum="39eb3fc284f97ae04d364fe31f41c875" name="tests/radius_put_attr_tag.phpt" role="test" />
+   <file md5sum="73b8a2233052aed98cc9881fc0f40dfe" name="tests/radius_put_int.phpt" role="test" />
+   <file md5sum="967d89c64158286b16d7241049503c46" name="tests/radius_put_int_tag.phpt" role="test" />
+   <file md5sum="1133b5d87925c41e5782e908b119c142" name="tests/radius_put_string.phpt" role="test" />
+   <file md5sum="b218b16f8b791fda5b4f011f6e03bf8f" name="tests/radius_put_string_tag.phpt" role="test" />
+   <file md5sum="1e71285d5a6cf1bd85b9509e70b703cb" name="tests/radius_put_vendor_addr.phpt" role="test" />
+   <file md5sum="faff3d48fa19c28acc2482ebfa05196c" name="tests/radius_put_vendor_addr_tag.phpt" role="test" />
+   <file md5sum="4c74625810a583aae3e25ebd90d00d8b" name="tests/radius_put_vendor_attr.phpt" role="test" />
+   <file md5sum="b49a0d4cd7327ecd32649623474fb958" name="tests/radius_put_vendor_attr_tag.phpt" role="test" />
+   <file md5sum="e95c9defa53a7b8d5e7e5f839c511a3e" name="tests/radius_put_vendor_int.phpt" role="test" />
+   <file md5sum="48f771ff2feec2725c7a5ad155e013c0" name="tests/radius_put_vendor_int_tag.phpt" role="test" />
+   <file md5sum="efc4f5aa85429151d6cb94866e23e871" name="tests/radius_put_vendor_string.phpt" role="test" />
+   <file md5sum="f17361f634bc427cc0076ffae45a4aef" name="tests/radius_put_vendor_string_tag.phpt" role="test" />
+   <file md5sum="7d61d08c3ccb8448ff0f5a0e6c77fc90" name="tests/radius_request_authenticator.phpt" role="test" />
+   <file md5sum="1cc00eb0f52ed74c9ab0b51da1cbafb8" name="tests/radius_salt_encrypt_attr.phpt" role="test" />
    <file md5sum="8612d249e2611a260960f24d0950709c" name="tests/radius_server_secret.phpt" role="test" />
    <file md5sum="9c23f62808ee602a889ac6b2ff7c561e" name="tests/radius_server_secret_config.phpt" role="test" />
    <file md5sum="52b1f8bab8ceef10d52f80c1242f37d1" name="config.m4" role="src" />
-   <file md5sum="0635a86eeedccbd9871cc7a073cdedfe" name="CREDITS" role="src" />
+   <file md5sum="a4765ae26f6116be665ee4c97d3ef496" name="config.w32" role="src" />
+   <file md5sum="9ab005d49da8ea33b4fddb62a7ba374c" name="CREDITS" role="doc" />
+   <file md5sum="1e50d4afb32d20d3c990cb41976da9ab" name="LICENSE" role="doc" />
    <file md5sum="9e30411dec8d2c49b771d48750927202" name="Makefile.in" role="src" />
-   <file md5sum="0b6529c579bd5168fbbb258d497f615e" name="php_radius.h" role="src" />
-   <file md5sum="25544783156147e0d598cdbea266f8fe" name="radius.c" role="src" />
+   <file md5sum="5e9da3f2158123abf6833d9c5ad50418" name="php_radius.h" role="src" />
+   <file md5sum="ac38fdd33abdfea8bbf02917c1d02e3b" name="radius.c" role="src" />
    <file md5sum="32314145ab4a36966dade15c2261a51a" name="radius.conf" role="src" />
    <file md5sum="a01a9e5453ddccebc5efe87099c24b73" name="radius.dsp" role="src" />
    <file md5sum="c7b1fcf55179bf615e35742eb3f3769c" name="radius.dsw" role="src" />
-   <file md5sum="4a15efd2ccf7471a23d9fa9306c5286f" name="radius_init_const.h" role="src" />
-   <file md5sum="91c73d7deb940ecf66eeca4971d4ca1c" name="radlib.c" role="src" />
-   <file md5sum="2f21623e1d0e7254b2ea84d4414708bd" name="radlib.h" role="src" />
+   <file md5sum="bc43e393a7c2a747b5964a9c5aee0d8c" name="radius_init_const.h" role="src" />
+   <file md5sum="3feafe670018cb923a827b620e641116" name="radlib.c" role="src" />
+   <file md5sum="67315cdd8a1fb01f714a0fe66e6ae9ea" name="radlib.h" role="src" />
    <file md5sum="732ba9cd1657b19cd8479fc1e7081249" name="radlib_compat.c" role="src" />
-   <file md5sum="539592925e7623a5fa962118e3d953a4" name="radlib_compat.h" role="src" />
+   <file md5sum="22c192f920625f529a77d79df529d185" name="radlib_compat.h" role="src" />
    <file md5sum="99603d0ebaada124f170275804c45b01" name="radlib_md5.h" role="src" />
-   <file md5sum="1286558a39165e64ae813ba2ab5bf119" name="radlib_private.h" role="src" />
-   <file md5sum="f7d7464803ae5038ac1ed1648c57a264" name="radlib_vs.h" role="src" />
+   <file md5sum="6306e4a5505e89b072f1095ad1589a75" name="radlib_private.h" role="src" />
+   <file md5sum="ba0b5365fd1acaacb836743e434cd913" name="radlib_vs.h" role="src" />
   </dir>
  </contents>
  <dependencies>
   <required>
    <php>
-    <min>4.3.0</min>
+    <min>5.3.0</min>
    </php>
    <pearinstaller>
     <min>1.4.0b1</min>
@@ -94,6 +117,77 @@
  <changelog>
   <release>
    <version>
+    <release>1.4.0b1</release>
+    <api>1.4.0b1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2016-02-15</date>
+   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
+   <notes>
+- Add PHP 7.0 support. (Adam)
+- Drop support for PHP &lt; 5.3.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.0</release>
+    <api>1.3.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2016-02-15</date>
+   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
+   <notes>
+- Fixed bug #65156 (Please provide LICENSE file). (Adam)
+- Fixed bug #65378 (radius.c:706: error: too many arguments to function ‘rad_salt_value’). (Adam)
+- Fixed bug #65599 (Fix compiling for VC11 x64). (Jan Ehrhardt)
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.0b1</release>
+    <api>1.3.0b1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2013-07-04</date>
+   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
+   <notes>
+This release adds several new features:
+
+- Support for CoA and disconnect packets.
+- Support for tagged attributes.
+- Support for salt-encrypted attributes.
+- Support for Juniper vendor specific attributes.
+
+These features are based on code written by Gabriel Blanchard in his fork of
+PECL radius: https://github.com/gblanchard/pecl-radius.
+
+Three new functions have been added to handle these features:
+
+- radius_get_tagged_attr_data(string attr)
+  This function returns the data from a tagged attribute.
+- radius_get_tagged_attr_tag(string attr)
+  This function returns the tag from a tagged attribute.
+- radius_salt_encrypt_attr(resource radius_handle, string attr)
+  This function salt-encrypts the given attribute. This shouldn&apos;t normally need
+  to be called manually, but is available for unusual use cases.
+
+Salt encryption is generally achieved through the use of the new
+RADIUS_OPTION_SALT option. All put functions have been extended to accept an
+optional options bitfield and an optional tag value, which will be used to tag
+an attribute if the RADIUS_OPTION_TAGGED option is set.
+   </notes>
+  </release>
+  <release>
+   <version>
     <release>1.2.7</release>
     <api>1.2.7</api>
    </version>
@@ -101,6 +195,7 @@
     <release>stable</release>
     <api>stable</api>
    </stability>
+   <date>2013-06-27</date>
    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
    <notes>
 This release fixes a security issue in radius_get_vendor_attr(). It is strongly
@@ -120,6 +215,7 @@
     <release>stable</release>
     <api>stable</api>
    </stability>
+   <date>2013-06-20</date>
    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
    <notes>
 - Support added for PHP 5.4 and 5.5. (Johannes)
diff -Nru php-radius-1.2.7/php-radius-1.2/CHANGES php-radius-1.4.0~b1/php-radius-1.2/CHANGES
--- php-radius-1.2.7/php-radius-1.2/CHANGES	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/CHANGES	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-$Id: CHANGES,v 1.2 2002/01/23 23:21:20 mavetju Exp $
-
-v1.2
-	- Michael Long <mlong@infoave.net> suggested a select
-	  timeout feature.
-
-v1.1
-	- PHP 4.1.1 is out, and the socket functions have been
-	  renamed. Updated for this.
-	- Added sample script with caching
-
-v1.0
-	- Initial release
diff -Nru php-radius-1.2.7/php-radius-1.2/check_login_pass.php php-radius-1.4.0~b1/php-radius-1.2/check_login_pass.php
--- php-radius-1.2.7/php-radius-1.2/check_login_pass.php	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/check_login_pass.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<?php
-/*
- * Copyright (C) 2004 Roberto Lumbreras <rover@debian.org>
- * License: public domain.
- */
-function check_login_pass($username, $password) {
-	require("/usr/share/php-radius/radius_authentication.inc.php");
-
-	$retval = RADIUS_AUTHENTICATION($username, $password);
-	switch ($retval) {
-		case 2:
-			/* 2 -> Access-Accept */
-			return TRUE;
-			break;
-		case 3:
-			/* 3 -> Access-Reject */
-			echo "login incorrect";
-			break;
-		default:
-			echo "temporally failure or other error";
-			break;
-	}
-	return FALSE;
-}
-
-?>
diff -Nru php-radius-1.2.7/php-radius-1.2/CONTACT php-radius-1.4.0~b1/php-radius-1.2/CONTACT
--- php-radius-1.2.7/php-radius-1.2/CONTACT	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/CONTACT	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-$Id: CONTACT,v 1.1 2002/01/20 22:28:11 mavetju Exp $
-
-HOW TO CONTACT
-
-Via email:		edwin@mavetju.org
-Via snail-mail:		Edwin Groothuis
-			7 Islington Crescent
-			Greenacre NSW2190
-			AUSTRALIA
-
-I have two mailing-lists:
-    announce@lists.mavetju.org		<- low traffic announcements only
-    questions@lists.mavetju.org		<- general questions
-
-See http://www.mavetju.org/contacts.php on how to subscribe to them.
diff -Nru php-radius-1.2.7/php-radius-1.2/LICENSE php-radius-1.4.0~b1/php-radius-1.2/LICENSE
--- php-radius-1.2.7/php-radius-1.2/LICENSE	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-
-Copyright 2000, 2001, 2002 by Edwin Groothuis. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-	This product includes software developed by Edwin Groothuis.
-4. Neither the name of Edwin Groothuis may be used to endorse or
-   promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff -Nru php-radius-1.2.7/php-radius-1.2/radius_authentication.conf.template php-radius-1.4.0~b1/php-radius-1.2/radius_authentication.conf.template
--- php-radius-1.2.7/php-radius-1.2/radius_authentication.conf.template	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/radius_authentication.conf.template	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#
-# $Id: radius_authentication.conf.template,v 1.1 2001/08/24 14:19:10 mavetju Exp $
-#
-# The IP address or hostname of the radius server
-#
-server a.b.c.d
-#
-# The port of the radius-server, if it is zero it will take the
-# one specified in /etc/services. 1645 is a well known one.
-# 
-port 0
-#
-# Suffix for the userids (if no @ in the userid yet)
-#
-# This might be a little bit tricky to understand. Normally, you can
-# authenticate via "user" or "user@domain". To make it easier for
-# people, the "@domain" is often defaulted to a special domain. For
-# example, if the suffix is foo.bar, the users will be authenticated
-# as "user@foo.bar", while it is still possible for somebody else,
-# who is not in domain foo.bar to give "admin@foo2.bar" for his userid.
-#
-#
-suffix ""
-#
-# Shared secret for the server
-#
-secret sharedsecret
diff -Nru php-radius-1.2.7/php-radius-1.2/radius_authentication.inc php-radius-1.4.0~b1/php-radius-1.2/radius_authentication.inc
--- php-radius-1.2.7/php-radius-1.2/radius_authentication.inc	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/radius_authentication.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-<?
-    //
-    // $Id: radius_authentication.inc,v 1.3 2002/01/23 23:21:20 mavetju Exp $
-    //
-    // Roberto Lumbreras <rover@debian.org> Tue, 23 Mar 2004 00:34:01 +0100
-    //   select fixes, error checks, more than one config file
-    //
-    // radius authentication v1.0 by Edwin Groothuis (edwin@mavetju.org)
-    //
-    // If you didn't get this file via http://www.mavetju.org, please
-    // check for the availability of newer versions.
-    //
-    // See LICENSE for distribution issues. If this file isn't in
-    // the distribution, please inform me about it.
-    //
-    // If you want to use this script, fill in the configuration in
-    // radius_authentication.conf and call the function
-    // RADIUS_AUTHENTICATION() with the username and password
-    // provided by the user. If it returns a 2, the authentication
-    // was successfull!
-
-    // If you want to use this, make sure that you have raw sockets
-    // enabled during compile-time: "./configure --enable-sockets".
-
-    function init_radiusconfig(&$server,&$port,&$sharedsecret,&$suffix) {
-    	global $radius_server;
-	if (is_file("radius_authentication.conf")) {
-	    $filename="radius_authentication.conf";
-	} else if (isset($radius_server) &&
-	is_file("/etc/php-radius/server-$radius_server.conf")) {
-	    $filename="/etc/php-radius/server-$radius_server.conf";
-	} else if (is_file("/etc/php-radius/server.conf")){
-	    $filename="/etc/php-radius/server.conf";
-	} else {
-	    echo "Couldn't find any config file, exiting";
-	    exit(0);
-	}
-	$file=fopen($filename,"r");
-	if ($file==0) {
-	    echo "Couldn't open $filename, exiting";
-	    exit(0);
-	}
-	while (!feof($file)) {
-	    $s=fgets($file,1024);
-	    $s=chop($s);
-	    if ($s[0]=="#") continue;
-	    if (strlen($s)==0) continue;
-	    if (preg_match("/^([a-zA-Z]+) (.*)$/",$s,$a)) {
-		if ($a[1]=="port")   { $port=$a[2];continue; }
-		if ($a[1]=="server") { $server=$a[2];continue; }
-		if ($a[1]=="secret") { $sharedsecret=$a[2];continue; }
-		if ($a[1]=="suffix") { 
-		    $suffix=$a[2];
-		    if ($suffix=="\"\"") { 
-			$suffix="";
-		    }
-		    continue;
-		}
-	    }
-	    echo "Unknown config-file option: $a[1] ($s)\n";
-	    exit(0);
-	}
-	fclose($file);
-    }
-
-    function RADIUS_AUTHENTICATION($username,$password) {
-	global $debug;
-	$radiushost="";
-	$sharedsecret="";
-	$suffix="";
-
-	init_radiusconfig($radiushost,$radiusport,$sharedsecret,$suffix);
-
-	// check your /etc/services. Some radius servers 
-	// listen on port 1812, some on 1645.
-	if ($radiusport==0)
-	    $radiusport=getservbyname("radius","udp");
-
-	$nasIP=explode(".",$_SERVER['SERVER_ADDR']);
-	$ip=gethostbyname($radiushost);
-
-	// 17 is UDP, formerly known as PROTO_UDP
-	$sock=socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-	if ($sock==FALSE) {
-	    echo "socket_create() failed: " . socket_strerror(socket_last_error()) . "\n";
-	    exit(0);
-	}
-	$retval=socket_connect($sock,$ip,$radiusport);
-	if ($retval==FALSE) {
-	    echo "socket_connect() failed: " . socket_strerror(socket_last_error()) . "\n";
-	    exit(0);
-	}
-
-	if (!preg_match("/@/",$username))
-	    $username.=$suffix;
-
-	if ($debug)
-	    echo "<br>radius-port: $radiusport<br>radius-host: $radiushost<br>username: $username<br>suffix: $suffix<hr>\n";
-
-	$RA=pack("CCCCCCCCCCCCCCCC",				// auth code
-	    1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255,
-	    1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255,
-	    1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255,
-	    1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255, 1+mt_rand()%255);
-
-	$encryptedpassword=Encrypt($password,$sharedsecret,$RA);
-
-	$length=4+				// header
-		16+				// auth code
-		6+				// service type
-		2+strlen($username)+		// username
-		2+strlen($encryptedpassword)+	// userpassword
-		6+				// nasIP
-		6;				// nasPort
-
-	$thisidentifier=mt_rand()%256;
-	//          v   v v     v   v   v     v     v
-	$data=pack("CCCCa*CCCCCCCCa*CCa*CCCCCCCCN",
-	    1,$thisidentifier,$length/256,$length%256,		// header
-	    $RA,						// authcode
-	    6,6,0,0,0,1,					// service type
-	    1,2+strlen($username),$username,			// username
-	    2,2+strlen($encryptedpassword),$encryptedpassword,	// userpassword
-	    4,6,$nasIP[0],$nasIP[1],$nasIP[2],$nasIP[3],	// nasIP
-	    5,6,$_SERVER['SERVER_PORT']				// nasPort
-	    );
-
-	socket_write($sock,$data,$length);
-
-	if ($debug)
-	    echo "<br>writing $length bytes<hr>\n";
-
-	//
-	// Wait at most five seconds for the answer. Thanks to
-	// Michael Long <mlong@infoave.net> for his remark about this.
-	//
-	$read = array($sock);
-	$num_sockets = socket_select($read, $write = NULL, $except = NULL, 60);
-	if ($num_sockets === FALSE) {
-	    echo "socket_select() failed: " .
-	    	socket_strerror(socket_last_error()) . "\n";
-	    socket_close($sock);
-	    exit(0);
-	} elseif ($num_sockets == 0) {
-	    echo "No answer from radius server, aborting\n";
-	    socket_close($sock);
-	    exit(0);
-	}
-	unset($read);
-
-	$readdata=socket_read($sock,2);
-	socket_close($sock);
-	if ($readdata===FALSE) {
-	    echo "socket_read() failed: " .
-	    	socket_strerror(socket_last_error()) . "\n";
-	    exit(0);
-	}
-	if (ord(substr($readdata, 1, 1)) != $thisidentifier) {
-	    //echo "Wrong id received from radius server, aborting\n";
-	    //exit(0);
-	    return 3; // FIXME this is awfull
-	}
-
-	return ord($readdata);
-	// 2 -> Access-Accept
-	// 3 -> Access-Reject
-	// See RFC2138 for this.
-    }
-
-    function Encrypt($password,$key,$RA) {
-	global $debug;
-
-	$keyRA=$key.$RA;
-
-	if ($debug)
-	    echo "<br>key: $key<br>password: $password<hr>\n";
-
-	$md5checksum=md5($keyRA);
-	$output="";
-
-	for ($i=0;$i<=15;$i++) {
-	    if (2*$i>strlen($md5checksum)) $m=0; else $m=hexdec(substr($md5checksum,2*$i,2));
-	    if ($i>strlen($keyRA)) $k=0; else $k=ord(substr($keyRA,$i,1));
-	    if ($i>strlen($password)) $p=0; else $p=ord(substr($password,$i,1));
-	    $c=$m^$p;
-	    $output.=chr($c);
-	}
-	return $output;
-    }
-?>
diff -Nru php-radius-1.2.7/php-radius-1.2/radius.php php-radius-1.4.0~b1/php-radius-1.2/radius.php
--- php-radius-1.2.7/php-radius-1.2/radius.php	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/radius.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-<?php
-
-    //
-    // $Id: radius.php,v 1.1 2002/01/20 11:52:59 mavetju Exp $
-    //
-
-    //
-    // This script is protected. Only people who are able to
-    // authenticate themselves against a Radius server will be
-    // allowed to watch this.
-    //
-
-    //
-    // To make sure that the radius-server isn't overflown by
-    // requests and that it still works if the Radius server
-    // is using a one-time-password, we keep a local cache
-    // of the already authenticated people. The cache is valid
-    // for 15 minutes, but refreshed everytime a user is
-    // requesting this page (within the 15 minutes of course).
-    //
-    // The name of the cache is /tmp/radiuscache
-    // The name of the cookie is radius_test
-    //
-    // To use dbm-files you should compile PHP with --with-ndbm --with-db
-
-    if ($PHP_AUTH_USER=="") {
-	header("HTTP/1.0 401 Unauthorized");
-	Header("WWW-Authenticate: Basic realm=\"PHP Radius test script\"");
-	echo "<html><head><title>401 Unauthorized access</title></head><body>";
-	echo "<h1>401 Unauthorized access</h1>";
-	echo "You must login using your username and password.</body></html>";
-	exit;
-    }
-
-    require "radius_authentication.inc";
-    function radius_authenticate($user,$password) {
-	global $HTTP_COOKIE_VARS;
-	global $REMOTE_ADDR;
-
-	if (($db=dba_open("/tmp/radiuscache","c","ndbm"))==FALSE) {
-	    echo "Couldn't open /tmp/radiuscache<br>\n";
-	}
-
-	$cookie=$HTTP_COOKIE_VARS["radius_test"];
-	if ($cookie!="") {
-	    $lastid=dba_fetch($cookie."_id",$db);
-	    $laston=dba_fetch($cookie."_laston",$db);
-	    $lasthost=dba_fetch($cookie."_fromip",$db);
-	    $lastuserid=dba_fetch($cookie."_userid",$db);
-	}
-
-	//
-	// Sanity checking
-	//
-	if ($cookie=="" || $lastid=="" ||
-	    $laston==0 || $laston<time()-15*60 ||
-	    $lasthost!=$REMOTE_ADDR || $lastuserid!=$user) {
-
-	    // 2 -> Access-Accept
-	    // 3 -> Access-Reject
-	    if (($retval=RADIUS_AUTHENTICATION($user,$password))==2) {
-		if ($cookie=="") $cookie=md5(uniqid(rand()));
-		setcookie("radius_test",$cookie);
-		dba_replace($cookie."_id",$cookie,$db);
-		dba_replace($cookie."_userid",$user,$db);
-		dba_replace($cookie."_fromip",$REMOTE_ADDR,$db);
-		dba_replace($cookie."_laston",time(),$db);
-	    }
-	} else {
-	    setcookie("radius_test",$cookie);
-	    dba_replace($cookie."_laston",time(),$db);
-	    $retval=2;
-	}
-
-	dba_close($db);
-	return $retval==2;
-    }
-
-    if (!radius_authenticate($PHP_AUTH_USER,$PHP_AUTH_PW)) {
-	header("HTTP/1.0 401 Unauthorized");
-	Header("WWW-Authenticate: Basic realm=\"PHP Radius test script\"");
-	echo "<html><head><title>401 Unauthorized access</title></head><body>";
-	echo "<h1>401 Unauthorized access</h1>";
-	echo "You must login using a valid username and password</body></html>";
-	echo "Used was '$PHP_AUTH_USER' '$PHP_AUTH_PW'<br>\n";
-	exit;
-    }
-	
-    echo "<html><head><title>200 Welcome!</title></head><body>";
-    echo "<h1>200 Welcome</h1>";
-    echo "You logged in using a valid username and password</body></html>";
-
-?>
diff -Nru php-radius-1.2.7/php-radius-1.2/README php-radius-1.4.0~b1/php-radius-1.2/README
--- php-radius-1.2.7/php-radius-1.2/README	2016-04-04 19:51:15.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius-1.2/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-$Id: README,v 1.3 2002/01/23 23:21:20 mavetju Exp $
-
-This script allows you to do authentication against Radius servers.
-It's updated for PHP 4.1.1, with new names for the sockets-functions.
-
-Edwin Groothuis
-edwin@mavetju.org
-http://www.mavetju.org/programming/php.php
diff -Nru php-radius-1.2.7/php-radius.examples php-radius-1.4.0~b1/php-radius.examples
--- php-radius-1.2.7/php-radius.examples	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/php-radius.examples	2016-04-04 19:51:15.000000000 +0000
@@ -0,0 +1 @@
+radius-*/examples/*
diff -Nru php-radius-1.2.7/radius-1.2.7/config.m4 php-radius-1.4.0~b1/radius-1.2.7/config.m4
--- php-radius-1.2.7/radius-1.2.7/config.m4	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/config.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension radius
-
-PHP_ARG_ENABLE(radius, whether to enable radius support,
-dnl Make sure that the comment is aligned:
-[  --enable-radius           Enable radius support])
-
-if test "$PHP_RADIUS" != "no"; then
-
-  AC_TRY_COMPILE([
-#include <sys/types.h>
-  ], [
-u_int32_t ulongint;
-ulongint = 1;
-  ], [
-    AC_DEFINE(HAVE_U_INT32_T, 1, [ ])
-  ])
-
- PHP_NEW_EXTENSION(radius, radius.c radlib.c, $ext_shared)
-fi
diff -Nru php-radius-1.2.7/radius-1.2.7/CREDITS php-radius-1.4.0~b1/radius-1.2.7/CREDITS
--- php-radius-1.2.7/radius-1.2.7/CREDITS	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/CREDITS	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-RADIUS
-Michael Bretterklieber, The FreeBSD Project http://www.freebsd.org
\ No newline at end of file
diff -Nru php-radius-1.2.7/radius-1.2.7/examples/des.php php-radius-1.4.0~b1/radius-1.2.7/examples/des.php
--- php-radius-1.2.7/radius-1.2.7/examples/des.php	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/examples/des.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,295 +0,0 @@
-<?PHP
-/*The contents of this document are free for use by anyone for any purpose they choose.
-no warranty is implied, nor will one be honored.  The author assumes no liability for
-any consequences that may arise from the use of contents of this document.  Events not
-covered include but are not limited to: system crashes, system slowdown, system failure,
-fires, explosions, floods, earthquakes, boiling seas, intestinal inflammation, cold coffee,
-and total protonic inversion.
-Any questions, comments, or improvements are appreciated and can be directed to:
-
-Tim Thorpe
-blushift@netins.net
-*/
-
-/*
-This script implements the 56-bit DES encryption algorithm,
-created from scratch based on interpretation of the original
-specification document.
-
-des_encrypt_ecb("my key", "my text");
-and
-mcrypt_ecb (MCRYPT_DES, "my key", "my text", MCRYPT_ENCRYPT, str_pad("", 8, chr(0x00)));
-are functionally identical.
-
-Because PHP is lacking in bitwise operators, this set of routines
-makes use of data that has been expanded so that a byte becomes an 8-byte string.
-
-The script performs the transformations, and then condenses the data back to a usable form.
-Apologies for a lack of comments in the bulk of the functions.
-*/////////////////////////////////////////////////////////////////////////////
-
-function des_encrypt_ecb($key, $clearText) {
-//Function to implement Electronic Code Book encoding
-//I haven't had occasion to add any other methods or a decoder for that matter,
-//but all of the underlying functions were written to be universal to all encoding methods,
-//so adding other methods should be easy if you need them.
-
-    if (strlen($key) < 7)
-        $key = str_pad(substr($key, 0, 7), 7, chr(0x00));  //We need 7 bytes for a key; no more, no less
-        
-    if (strlen($key) == 7) $key = des_add_parity($key);
-	
-	$keys = des_make_subkeys (des_bits_to_bytes ($key));  //Chew the key into the subkeys needed for DES
-	$blockCount = (int) (strlen($clearText) / 8);  //Figure out how many blocks of 8 bytes we need to encode
-	if (strlen ($clearText) % 8) {  //Check to see if there are any leftovers
-		$blockCount++;  //Add another block for them
-		$clearText = str_pad($clearText, $blockCount * 8, chr(0x00));  //Pad it out with zeroes
-	}
-	for ($i = 0; $i < $blockCount; $i++) {  //Cycle through the blocks
-		$clearBlock = substr($clearText, $i * 8, 8);  //Grab a block from the input
-		$cypherBlock = des_block_encode(des_bits_to_bytes ($clearBlock), $keys);  //Encrypt it
-		$cypherText .= des_bytes_to_bits ($cypherBlock);  //Convert the result back to a useful form
-	}
-	return ($cypherText);  //Cough it up
-}
-
-function des_block_encode($clearText, $subKeys) {
-	$ip_table = array(58, 50, 42, 34, 26, 18, 10,  2,
-			  60, 52, 44, 36, 28, 20, 12,  4,
-			  62, 54, 46, 38, 30, 22, 14,  6,
-			  64, 56, 48, 40, 32, 24, 16,  8,
-			  57, 49, 41, 33, 25, 17,  9,  1,
-			  59, 51, 43, 35, 27, 19, 11,  3,
-			  61, 53, 45, 37, 29, 21, 13,  5,
-			  63, 55, 47, 39, 31, 23, 15,  7);
-
-	$ip1_table = array(40,  8, 48, 16, 56, 24, 64, 32,
-			   39,  7, 47, 15, 55, 23, 63, 31,
-			   38,  6, 46, 14, 54, 22, 62, 30,
-			   37,  5, 45, 13, 53, 21, 61, 29,
-			   36,  4, 44, 12, 52, 20, 60, 28,
-			   35,  3, 43, 11, 51, 19, 59, 27,
-			   34,  2, 42, 10, 50, 18, 58, 26,
-			   33,  1, 41,  9, 49, 17, 57, 25);
-
-	foreach ($ip_table as $bit) {
-		$ip .= $clearText[$bit - 1];
-	}
-	$l[0] = substr($ip, 0, 32);
-	$r[0] = substr($ip, 32);
-	for ($index = 1; $index <= 16; $index++) {
-		$l[$index] = $r[$index - 1];
-		$r[$index] = des_xor($l[$index - 1], des_transform($r[$index - 1], $subKeys[$index]));
-	}
-
-	foreach ($ip1_table as $bit) {
-		$concat	= $r[16] . $l[16];
-		$cypherBlock .= $concat[$bit - 1];
-	}
-	return ($cypherBlock);
-}
-
-function des_make_subkeys($key) {
-	$pc1 = array(57, 49, 41, 33, 25, 17,  9,
-		      1, 58, 50, 42, 34, 26, 18,
-		     10,  2, 59, 51, 43, 35, 27,
-		     19, 11,  3, 60, 52, 44, 36,
-		     63, 55, 47, 39, 31, 23, 15,
-		      7, 62, 54, 46, 38, 30, 22,
-		     14,  6, 61, 53, 45, 37, 29,
-		     21, 13,  5, 28, 20, 12,  4);
-
-	$pc2 = array(14, 17, 11, 24,  1,  5,
-		      3, 28, 15,  6, 21, 10,
-		     23, 19, 12,  4, 26,  8,
-		     16,  7, 27, 20, 13,  2,
-		     41, 52, 31, 37, 47, 55,
-		     30, 40, 51, 45, 33, 48,
-		     44, 49, 39, 56, 34, 53,
-		     46, 42, 50, 36, 29, 32);
-
-	$shifts = array(1, 1, 2, 2,
-			2, 2, 2, 2,
-			1, 2, 2, 2,
-			2, 2, 2, 1);
-	foreach ($pc1 as $bit) {
-		$k .= $key[$bit - 1];
-	}
-	$index = 0;
-	$c[$index] = substr($k, 0, 28);
-	$d[$index] = substr($k, 28);
-	unset ($k);
-	foreach ($shifts as $positions) {
-		$index++;
-		$c[$index] = des_rotate_left ($c[$index - 1], $positions);
-		$d[$index] = des_rotate_left ($d[$index - 1], $positions);
-	}
-	for ($i = 1; $i <= 16; $i++) {
-		foreach ($pc2 as $bit) {
-			$concat = $c[$i] . $d[$i];
-			$k[$i] .= $concat[$bit - 1];
-		}
-	}
-	return ($k);
-}
-
-function des_transform($data, $key) {
-	$e_table = array(32,  1,  2,  3,  4,  5,
-			  4,  5,  6,  7,  8,  9,
-			  8,  9, 10, 11, 12, 13,
-			 12, 13, 14, 15, 16, 17,
-			 16, 17, 18, 19, 20, 21,
-			 20, 21, 22, 23, 24, 25,
-			 24, 25, 26, 27, 28, 29,
-			 28, 29, 30, 31, 32,  1);
-
-	$s = array(array(14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
-			  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
-			  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-			 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13),
-		   array(15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
-			  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
-			  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-			 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9),
-		   array(10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
-			 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
-			 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-			  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12),
-		   array( 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
-			 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
-			 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-			  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14),
-		   array( 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
-			 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
-			  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-			 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3),
-		   array(12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
-			 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
-			  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-			  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13),
-		   array( 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
-			 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
-			  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-			  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12),
-		   array(13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0,  12,  7,
-			  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
-			  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13,  15, 3,  5,  8,
-			  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11));
-
-	$p_table = array(16,  7, 20, 21,
-                         29, 12, 28, 17,
-                          1, 15, 23, 26,
-                          5, 18, 31, 10,
-                          2,  8, 24, 14,
-                         32, 27,  3,  9,
-                         19, 13, 30,  6,
-                         22, 11,  4, 25);
-
-	$nybbles = array(chr(0x00).chr(0x00).chr(0x00).chr(0x00), chr(0x00).chr(0x00).chr(0x00).chr(0x01),
-			 chr(0x00).chr(0x00).chr(0x01).chr(0x00), chr(0x00).chr(0x00).chr(0x01).chr(0x01),
-			 chr(0x00).chr(0x01).chr(0x00).chr(0x00), chr(0x00).chr(0x01).chr(0x00).chr(0x01),
-			 chr(0x00).chr(0x01).chr(0x01).chr(0x00), chr(0x00).chr(0x01).chr(0x01).chr(0x01),
-			 chr(0x01).chr(0x00).chr(0x00).chr(0x00), chr(0x01).chr(0x00).chr(0x00).chr(0x01),
-			 chr(0x01).chr(0x00).chr(0x01).chr(0x00), chr(0x01).chr(0x00).chr(0x01).chr(0x01),
-			 chr(0x01).chr(0x01).chr(0x00).chr(0x00), chr(0x01).chr(0x01).chr(0x00).chr(0x01),
-			 chr(0x01).chr(0x01).chr(0x01).chr(0x00), chr(0x01).chr(0x01).chr(0x01).chr(0x01));
-
-
-	foreach ($e_table as $bit) {
-		$e .= $data[$bit - 1];
-	}
-	$ek = des_xor($e, $key);
-	for ($i = 0; $i < 8; $i++) {
-		$offset = $i * 6;
-		$sAddress = ord($ek[$offset]) * 0x20 +
-			    ord($ek[$offset + 1]) * 0x08 +
-			    ord($ek[$offset + 2]) * 0x04 +
-			    ord($ek[$offset + 3]) * 0x02 +
-			    ord($ek[$offset + 4]) +
-			    ord($ek[$offset + 5]) * 0x10;
-		$sResult .= $nybbles[$s[$i][$sAddress]];
-	}
-	foreach ($p_table as $bit) {
-		$p .= $sResult[$bit - 1];
-	}
-	return ($p);
-}
-
-function des_bits_to_bytes($bitStream) {
-	for ($i = 0; $i < strlen($bitStream); $i++) {
-		$val = ord($bitStream[$i]);
-		if ($val & 0x80) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x40) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x20) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x10) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x08) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x04) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x02) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-		if ($val & 0x01) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
-	}
-	return ($byteStream);
-}
-
-function des_bytes_to_bits($byteStream) {
-	for ($i = 0; $i < (strlen($byteStream) / 8); $i++) {
-		$offset	= $i * 8;
-		$value = ord($byteStream[$offset]) * 0x80 +
-			 ord($byteStream[$offset + 1]) * 0x40 +
-			 ord($byteStream[$offset + 2]) * 0x20 +
-			 ord($byteStream[$offset + 3]) * 0x10 +
-			 ord($byteStream[$offset + 4]) * 0x08 +
-			 ord($byteStream[$offset + 5]) * 0x04 +
-			 ord($byteStream[$offset + 6]) * 0x02 +
-			 ord($byteStream[$offset + 7]);
-		$bitStream .= chr($value);
-
-	}
-	return ($bitStream);
-}
-
-function des_rotate_left($input, $positions) {
-	return substr($input, $positions) . substr($input, 0, $positions);
-}
-
-function des_xor($a, $b) {
-	for ($i = 0; $i < strlen($a); $i++) {
-		$xor .= $a[$i] ^ $b[$i];
-	}
-	return $xor;
-}
-
-// DES helper function
-// input: 7-Bytes Key without parity
-// ouput: 8-Bytes Key with parity
-function des_add_parity($key) 
-{
-    static $odd_parity = array(
-        1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
-        16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
-        32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
-        49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
-        64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
-        81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
-        97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
-        112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
-        128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
-        145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
-        161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
-        176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
-        193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
-        208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
-        224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
-        241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254);
-
-    for ($i = 0; $i < strlen($key); $i++) {
-        $bin .= sprintf('%08s', decbin(ord($key{$i})));
-    }
-
-    $str1 = explode('-', substr(chunk_split($bin, 7, '-'), 0, -1));
-    foreach($str1 as $s) {
-        $x .= sprintf('%02s', dechex($odd_parity[bindec($s . '0')]));
-    }
-
-    return pack('H*', $x);
-
-}
diff -Nru php-radius-1.2.7/radius-1.2.7/examples/mschap.php php-radius-1.4.0~b1/radius-1.2.7/examples/mschap.php
--- php-radius-1.2.7/radius-1.2.7/examples/mschap.php	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/examples/mschap.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-<?php
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-include_once 'des.php';
-
-function NtPasswordHash($plain) 
-{
-    return mhash (MHASH_MD4, str2unicode($plain));
-}
-
-function str2unicode($str) 
-{
-
-    for ($i=0;$i<strlen($str);$i++) {
-        $a = ord($str{$i}) << 8;
-        $uni .= sprintf("%X",$a);
-    }
-    return pack('H*', $uni);
-}
-
-function GenerateChallenge($size = 8) 
-{
-    mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff);
-    for($i = 0; $i < $size; $i++) {
-        $chall .= pack('C', 1 + mt_rand() % 255);
-    }
-    return $chall;
-}
-
-function ChallengeResponse($challenge, $nthash) 
-{
-    while (strlen($nthash) < 21)
-        $nthash .= "\0";
-
-    $resp1 = des_encrypt_ecb(substr($nthash, 0, 7), $challenge);
-    $resp2 = des_encrypt_ecb(substr($nthash, 7, 7), $challenge);
-    $resp3 = des_encrypt_ecb(substr($nthash, 14, 7), $challenge);
-
-    return $resp1 . $resp2 . $resp3;
-}
-
-// MS-CHAPv2
-
-function GeneratePeerChallenge() 
-{
-    return GenerateChallenge(16);
-}
-
-function NtPasswordHashHash($hash) 
-{
-    return mhash (MHASH_MD4, $hash);
-}
-
-function ChallengeHash($challenge, $peerChallenge, $username) 
-{
-    return substr(mhash (MHASH_SHA1, $peerChallenge . $challenge . $username), 0, 8);
-}
-
-function GenerateNTResponse($challenge, $peerChallenge, $username, $password) 
-{
-    $challengeHash = ChallengeHash($challenge, $peerChallenge, $username);
-    $pwhash = NtPasswordHash($password);
-    return ChallengeResponse($challengeHash, $pwhash);
-}
-
-?>
diff -Nru php-radius-1.2.7/radius-1.2.7/examples/mschaptest.php php-radius-1.4.0~b1/radius-1.2.7/examples/mschaptest.php
--- php-radius-1.2.7/radius-1.2.7/examples/mschaptest.php	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/examples/mschaptest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<?php
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-include_once('mschap.php');
-
-
-echo "MS-CHAPv1 TEST\n";
-$pass = 'MyPw';
-$challenge = pack('H*', '102DB5DF085D3041');
-printf ("Test Challenge: %s\n", bin2hex($challenge));
-$unipw = str2unicode($pass);
-printf ("Unicode PW: %s\nexpected  : 4d00790050007700\n", bin2hex($unipw));
-$nthash = NtPasswordHash($pass);
-printf ("NT HASH   : %s\nexpected  : fc156af7edcd6c0edde3337d427f4eac\n", bin2hex($nthash));
-$challresp = ChallengeResponse($challenge, $nthash);
-printf ("ChallResp : %s\nexpected  : 4e9d3c8f9cfd385d5bf4d3246791956ca4c351ab409a3d61\n", bin2hex($challresp));
-echo "\n";
-
-echo "MS-CHAPv2 TEST\n";
-$user = 'User';
-$pass = 'clientPass';
-printf ("Username  : %s\nexpected  : 55736572\n", bin2hex($user));
-$challenge = pack('H*', 'd02e4386bce91226');
-printf ("Challenge     : %s\n", bin2hex($challenge));
-$authchallenge = pack('H*', '5b5d7c7d7b3f2f3e3c2c602132262628');
-printf ("Auth Challenge: %s\n", bin2hex($authchallenge));
-$peerChallenge = pack('H*', '21402324255E262A28295F2B3A337C7E');
-printf ("Peer Challenge: %s\n", bin2hex($peerChallenge));
-$nthash = NtPasswordHash($pass);
-printf ("NT HASH      : %s\nexpected     : 44ebba8d5312b8d611474411f56989ae\n", bin2hex($nthash));
-$nthashhash = NtPasswordHashHash($nthash);
-printf ("NT HASH-HASH : %s\nexpected     : 41c00c584bd2d91c4017a2a12fa59f3f\n", bin2hex($nthashhash));
-$resp = GenerateNtResponse($authchallenge, $peerChallenge, $user, $pass);
-printf ("ChallResp    : %s\nexpected     : 82309ecd8d708b5ea08faa3981cd83544233114a3d85d6df\n", bin2hex($resp));
-echo "\n";
-
-?>
diff -Nru php-radius-1.2.7/radius-1.2.7/examples/radius-acct.php php-radius-1.4.0~b1/radius-1.2.7/examples/radius-acct.php
--- php-radius-1.2.7/radius-1.2.7/examples/radius-acct.php	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/examples/radius-acct.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-<?php
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-if(!extension_loaded('radius')) {
-
-    if (preg_match('/windows/i', getenv('OS'))) {
-        dl('php_radius.dll');
-    } else {
-        dl('radius.so');
-    }
-
-}
-
-$username = 'sepp';
-$radserver = 'localhost';
-$radport = 1813;
-$starttime = time();
-$sharedsecret = 'testing123';
-
-if (!isset($REMOTE_ADDR)) $REMOTE_ADDR = '127.0.0.1';
-
-$res = radius_acct_open();
-echo "$res<br>\n";
-
-//if (!radius_config($res, '/etc/radius.conf')) {
-/*if (!radius_config($res, 'D:/php-devel/pear/PECL/radius/radius.conf')) {
- echo 'RadiusError:' . radius_strerror($res). "\n<br>";
- exit;
-}*/
-
-
-if (!radius_add_server($res, $radserver, $radport, $sharedsecret, 3, 3)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_create_request($res, RADIUS_ACCOUNTING_REQUEST)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_string($res, RADIUS_NAS_IDENTIFIER, isset($HTTP_HOST) ? $HTTP_HOST : 'localhost'))  {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
- 
-if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-  
-if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_string($res, RADIUS_CALLING_STATION_ID, isset($REMOTE_HOST) ? $REMOTE_HOST : '127.0.0.1') == -1) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_string($res, RADIUS_USER_NAME, $username)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_addr($res, RADIUS_FRAMED_IP_ADDRESS, $REMOTE_ADDR)) {
-    echo 'RadiusError1:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-// RADIUS_START => start accounting
-// RADIUS_STOP => stop accounting
-if (!radius_put_int($res, RADIUS_ACCT_STATUS_TYPE, RADIUS_START)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-/* Generate a session ID */
-$sessionid = sprintf("%s:%d-%s", $REMOTE_ADDR, getmypid(), get_current_user());
-if (!radius_put_string($res, RADIUS_ACCT_SESSION_ID, $sessionid)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-// RADIUS_AUTH_RADIUS => authenticated via Radius
-// RADIUS_AUTH_LOCAL => authenicated local
-// RADIUS_AUTH_REMOTE => authenticated remote
-if (!radius_put_int($res, RADIUS_ACCT_AUTHENTIC, RADIUS_AUTH_LOCAL)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-sleep(3);
-// if RADIUS_ACCT_STATUS_TYPE == RADIUS_STOP 
-if (!radius_put_int($res, RADIUS_ACCT_TERMINATE_CAUSE, RADIUS_TERM_USER_REQUEST)) {
-    echo 'RadiusError2:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_int($res, RADIUS_ACCT_SESSION_TIME, time() - $starttime)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-// endif
-
-$req = radius_send_request($res);
-if (!$req) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-switch($req) {
-
-case RADIUS_ACCOUNTING_RESPONSE:
-    echo "Radius Accounting response<br>\n";    
-    break;
-
-default:
-    echo "Unexpected return value:$req\n<br>";
-    
-}
-
-
-radius_close($res);
-
-?>
diff -Nru php-radius-1.2.7/radius-1.2.7/examples/radius-auth.php php-radius-1.4.0~b1/radius-1.2.7/examples/radius-auth.php
--- php-radius-1.2.7/radius-1.2.7/examples/radius-auth.php	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/examples/radius-auth.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,388 +0,0 @@
-<?php
-/*
-Copyright (c) 2003-2007, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-if(!extension_loaded('radius')) {
-
-    if (preg_match('/windows/i', getenv('OS'))) {
-        dl('php_radius.dll');
-    } else {
-        dl('radius.so');
-    }
-
-}
-
-$module = 'radius';
-$functions = get_extension_funcs($module);
-echo "Functions available in the test extension:<br>\n";
-foreach($functions as $func) echo $func . "<br>\n";
-
-$username = 'sepp';
-$password = 'sepp';
-$radserver = 'localhost';
-$radport = 1812;
-$sharedsecret = 'testing123';
-$auth_type = 'pap';
-//$auth_type = 'chap';
-//$auth_type = 'mschapv1';
-//$auth_type = 'mschapv2';
-
-$res = radius_auth_open();
-echo "$res<br>\n";
-
-//if (!radius_config($res, '/etc/radius.conf')) {
-/*if (!radius_config($res, 'D:/php-devel/pear/PECL/radius/radius.conf')) {
- echo 'RadiusError:' . radius_strerror($res). "\n<br>";
- exit;
-}*/
-
-
-if (!radius_add_server($res, $radserver, $radport, $sharedsecret, 3, 3)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_add_server($res, $radserver, $radport, 'testing123', 3, 3)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_create_request($res, RADIUS_ACCESS_REQUEST)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_string($res, RADIUS_NAS_IDENTIFIER, isset($HTTP_HOST) ? $HTTP_HOST : 'localhost'))  {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
- 
-if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-  
-if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_string($res, RADIUS_CALLING_STATION_ID, isset($REMOTE_HOST) ? $REMOTE_HOST : '127.0.0.1') == -1) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_string($res, RADIUS_USER_NAME, $username)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if ($auth_type == 'chap') {
-    echo "CHAP<br>\n";
-
-    /* generate Challenge */
-    mt_srand(time());
-    $chall = mt_rand();
-
-    // FYI: CHAP = md5(ident + plaintextpass + challenge)
-    $chapval = pack('H*', md5(pack('Ca*',1 , $password . $chall)));
-//    $chapval = md5(pack('Ca*',1 , $password . $chall));
-    // Radius wants the CHAP Ident in the first byte of the CHAP-Password
-    $pass = pack('C', 1) . $chapval;
-
-    if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
-        echo 'RadiusError: RADIUS_CHAP_PASSWORD:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-
-    if (!radius_put_attr($res, RADIUS_CHAP_CHALLENGE, $chall)) {
-        echo 'RadiusError: RADIUS_CHAP_CHALLENGE:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-
-}  else if ($auth_type == 'mschapv1') {
-    echo "MS-CHAPv1<br>\n";
-    include_once('mschap.php');
-
-    $challenge = GenerateChallenge();
-    printf ("Challenge:%s\n", bin2hex($challenge));
-
-    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP_CHALLENGE, $challenge)) {
-        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP_CHALLENGE:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-
-    $ntresp = ChallengeResponse($challenge, NtPasswordHash($password));
-    $lmresp = str_repeat ("\0", 24);
-
-    printf ("NT Response:%s\n", bin2hex($ntresp));
-    // Response: chapid, flags (1 = use NT Response), LM Response, NT Response
-    $resp = pack('CCa48',1 , 1, $lmresp . $ntresp);
-    printf ("Response:%d %s\n", strlen($resp), bin2hex($resp));
-
-    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP_RESPONSE, $resp)) {
-        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP_RESPONSE:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-
-} else if ($auth_type == 'mschapv2') {
-    echo "MS-CHAPv2<br>\n";
-    include_once('mschap.php');
-
-    $authChallenge = GenerateChallenge(16);
-    printf ("Auth Challenge:%s\n", bin2hex($authChallenge));
-
-    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP_CHALLENGE, $authChallenge)) {
-        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP_CHALLENGE:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-
-    // we have no client, therefore we generate the Peer-Challenge
-    $peerChallenge = GeneratePeerChallenge();
-    printf ("Peer Challenge:%s\n", bin2hex($peerChallenge));
-
-    $ntresp = GenerateNTResponse($authChallenge, $peerChallenge, $username, $password);
-    $reserved = str_repeat ("\0", 8);
-
-    printf ("NT Response:%s\n", bin2hex($ntresp));
-    // Response: chapid, flags (1 = use NT Response), Peer challenge, reserved, Response
-    $resp = pack('CCa16a8a24',1 , 1, $peerChallenge, $reserved, $ntresp);
-    printf ("Response:%d %s\n", strlen($resp), bin2hex($resp));
-
-    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP2_RESPONSE, $resp)) {
-        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP2_RESPONSE:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-
-} else {
-    echo "PAP<br>\n";
-
-    if (!radius_put_string($res, RADIUS_USER_PASSWORD, "sepp")) {
-        echo 'RadiusError:' . radius_strerror($res). "<br>\n";
-        exit;
-    }
-}
-
-if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-$req = radius_send_request($res);
-if (!$req) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-
-switch($req) {
-case RADIUS_ACCESS_ACCEPT:
-        echo "Radius Request accepted<br>\n";
-    break;
-
-case RADIUS_ACCESS_REJECT:
-    echo "Radius Request rejected<br>\n";
-    break;
-
-default:
-    echo "Unexpected return value:$req\n<br>";
-}
-
-while ($resa = radius_get_attr($res)) {
-
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-    //printf("Got Attr:%d %d Bytes %s\n", $attr, strlen($data), bin2hex($data));
-
-    switch ($attr) {
-
-    case RADIUS_FRAMED_IP_ADDRESS:
-        $ip = radius_cvt_addr($data);
-        echo "IP: $ip<br>\n";
-        break;
-
-    case RADIUS_FRAMED_IP_NETMASK:
-        $mask = radius_cvt_addr($data);
-        echo "MASK: $mask<br>\n";
-        break;
-
-    case RADIUS_FRAMED_MTU:
-        $mtu = radius_cvt_int($data);
-        echo "MTU: $mtu<br>\n";
-        break;
-
-    case RADIUS_FRAMED_COMPRESSION:
-        $comp = radius_cvt_int($data);
-        echo "Compression: $comp<br>\n";
-        break;
-
-    case RADIUS_SESSION_TIMEOUT:
-        $time = radius_cvt_int($data);
-        echo "Session timeout: $time<br>\n";
-        ini_set('max_execution_time', $time);
-        break;
-
-    case RADIUS_IDLE_TIMEOUT:
-        $idletime = radius_cvt_int($data);
-        echo "Idle timeout: $idletime<br>\n";
-        break;
-
-    case RADIUS_SERVICE_TYPE:
-        $type = radius_cvt_int($data);
-        echo "Service Type: $type<br>\n";
-        break;
-
-    case RADIUS_CLASS:
-        $class = radius_cvt_int($data);
-        echo "Class: $class<br>\n";
-        break;
-
-    case RADIUS_FRAMED_PROTOCOL:
-        $proto = radius_cvt_int($data);
-        echo "Protocol: $proto<br>\n";
-        break;
-
-    case RADIUS_FRAMED_ROUTING:
-        $rout = radius_cvt_int($data);
-        echo "Routing: $rout<br>\n";
-        break;
-
-    case RADIUS_FILTER_ID:
-        $id = radius_cvt_string($data);
-        echo "Filter ID: $id<br>\n";
-        break;
-
-    case RADIUS_VENDOR_SPECIFIC:
-        //printf ("Vendor specific (%d)<br>\n", $attr);
-
-        $resv = radius_get_vendor_attr($data);
-        if (is_array($resv)) {
-            $vendor = $resv['vendor'];
-            $attrv = $resv['attr'];
-            $datav = $resv['data'];
-
-            if ($vendor == RADIUS_VENDOR_MICROSOFT) {
-
-                switch ($attrv) {
-
-                case RADIUS_MICROSOFT_MS_CHAP2_SUCCESS:
-                    $mschap2resp = radius_cvt_string($datav);
-                    printf ("MS CHAPv2 success: %s<br>\n", $mschap2resp);                    
-                    break;
-
-                case RADIUS_MICROSOFT_MS_CHAP_ERROR:
-                    $errormsg = radius_cvt_string(substr($datav,1));
-                    echo "MS CHAP Error: $errormsg<br>\n";
-                    break;
-
-                case RADIUS_MICROSOFT_MS_CHAP_DOMAIN:
-                    $domain = radius_cvt_string($datav);
-                    echo "MS CHAP Domain: $domain<br>\n";
-                    break;
-
-                case RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY:
-                    $policy = radius_cvt_int($datav);
-                    echo "MS MPPE Policy: $policy<br>\n";
-                    break;
-
-                case RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES:
-                    $type = radius_cvt_int($datav);
-                    echo "MS MPPE Type: $type<br>\n";
-                    break;
-
-                case RADIUS_MICROSOFT_MS_CHAP_MPPE_KEYS:
-                    $demangled = radius_demangle($res, $datav);
-                    $lmkey = substr($demangled, 0, 8);
-                    $ntkey = substr($demangled, 8, RADIUS_MPPE_KEY_LEN);
-                    printf ("MS MPPE Keys: LM-Key: %s NT-Key: %s<br>\n", bin2hex($lmkey), bin2hex($ntkey));
-                    break;
-
-                case RADIUS_MICROSOFT_MS_MPPE_SEND_KEY:
-                    $demangled = radius_demangle_mppe_key($res, $datav);
-                    printf ("MS MPPE Send Key: %s<br>\n", bin2hex($demangled));
-                    break;
-
-                case RADIUS_MICROSOFT_MS_MPPE_RECV_KEY:
-                    $demangled = radius_demangle_mppe_key($res, $datav);
-                    printf ("MS MPPE Send Key: %s<br>\n", bin2hex($demangled));
-                    break;
-
-                case RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER:
-                    $server = radius_cvt_string($datav);
-                    printf ("MS Primary DNS Server: %s<br>\n", $server);
-                    break;
-
-                default:
-                    printf("Unexpected Microsoft attribute: %d<br>\n", $attrv);
-                }
-
-            }
-
-        } else {
-            printf ("Error getting Vendor attribute %s<br>\n", radius_strerror($res));
-        }
-        break;
-
-    default:
-        printf("Unexpected attribute: %d<br>\n", $attr);
-    }
-}
-
-$secret = radius_server_secret($res);
-if (!$secret) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-} else {
-    echo "Shared Secret:$secret<br>\n";
-}
-
-$authent = radius_request_authenticator($res);
-if (!$authent) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-} else {
-    printf ("Request Authenticator:%s Len:%d<br>\n", bin2hex($authent), strlen($authent));
-}
-
-radius_close($res);
-
-?>
diff -Nru php-radius-1.2.7/radius-1.2.7/Makefile.in php-radius-1.4.0~b1/radius-1.2.7/Makefile.in
--- php-radius-1.2.7/radius-1.2.7/Makefile.in	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# $Id$
-
-LTLIBRARY_NAME          = libradius.la
-LTLIBRARY_SOURCES       = radius.c radlib.c
-LTLIBRARY_SHARED_NAME   = radius.la
-LTLIBRARY_LIBADD  			= $(RADIUS_LIBADD)
-LTLIBRARY_SHARED_LIBADD = $(RADIUS_SHARED_LIBADD)
-
-include $(top_srcdir)/build/dynlib.mk
\ No newline at end of file
diff -Nru php-radius-1.2.7/radius-1.2.7/php_radius.h php-radius-1.4.0~b1/radius-1.2.7/php_radius.h
--- php-radius-1.2.7/radius-1.2.7/php_radius.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/php_radius.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-#include "radlib.h"
-#include "radlib_private.h"
-
-#ifndef PHP_RADIUS_H
-#define PHP_RADIUS_H
-
-#define phpext_radius_ptr &radius_module_entry
-
-#define PHP_RADIUS_VERSION "1.2.7"
-
-#ifdef PHP_WIN32
-#define PHP_RADIUS_API __declspec(dllexport)
-#else
-#define PHP_RADIUS_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-extern zend_module_entry radius_module_entry;
-
-typedef struct {
-	int id;
-	struct rad_handle *radh;
-} radius_descriptor;
-
-PHP_MINIT_FUNCTION(radius);
-PHP_MSHUTDOWN_FUNCTION(radius);
-PHP_MINFO_FUNCTION(radius);
-
-PHP_FUNCTION(radius_auth_open);
-PHP_FUNCTION(radius_acct_open);
-PHP_FUNCTION(radius_close);
-PHP_FUNCTION(radius_strerror);
-PHP_FUNCTION(radius_config);
-PHP_FUNCTION(radius_add_server);
-PHP_FUNCTION(radius_create_request);
-PHP_FUNCTION(radius_put_string);
-PHP_FUNCTION(radius_put_int);
-PHP_FUNCTION(radius_put_attr);
-PHP_FUNCTION(radius_put_addr);
-PHP_FUNCTION(radius_put_vendor_string);
-PHP_FUNCTION(radius_put_vendor_int);
-PHP_FUNCTION(radius_put_vendor_attr);
-PHP_FUNCTION(radius_put_vendor_addr);
-PHP_FUNCTION(radius_send_request);
-PHP_FUNCTION(radius_get_attr);
-PHP_FUNCTION(radius_get_vendor_attr);
-PHP_FUNCTION(radius_cvt_addr);
-PHP_FUNCTION(radius_cvt_int);
-PHP_FUNCTION(radius_cvt_string);
-PHP_FUNCTION(radius_request_authenticator);
-PHP_FUNCTION(radius_server_secret);
-PHP_FUNCTION(radius_demangle);
-PHP_FUNCTION(radius_demangle_mppe_key);
-
-#ifdef ZTS
-#define RADIUS_G(v) TSRMG(radius_globals_id, zend_radius_globals *, v)
-#else
-#define RADIUS_G(v) (radius_globals.v)
-#endif
-
-#endif	/* PHP_RADIUS_H */
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radius.c php-radius-1.4.0~b1/radius-1.2.7/radius.c
--- php-radius-1.2.7/radius-1.2.7/radius.c	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radius.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,740 +0,0 @@
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_ini.h"
-#include "php_network.h"
-#include "ext/standard/info.h"
-#include "php_radius.h"
-#include "radlib.h"
-#include "radlib_private.h"
-
-#ifndef PHP_WIN32
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-void _radius_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-
-/* If you declare any globals in php_radius.h uncomment this:
-ZEND_DECLARE_MODULE_GLOBALS(radius)
-*/
-
-/* True global resources - no need for thread safety here */
-static int le_radius;
-
-/* {{{ radius_functions[]
- *
- * Every user visible function must have an entry in radius_functions[].
- */
-zend_function_entry radius_functions[] = {
-	PHP_FE(radius_auth_open,    NULL)
-	PHP_FE(radius_acct_open,    NULL)
-	PHP_FE(radius_close,        NULL)
-	PHP_FE(radius_strerror,     NULL)
-	PHP_FE(radius_config,       NULL)
-	PHP_FE(radius_add_server,	NULL)
-	PHP_FE(radius_create_request,	NULL)
-	PHP_FE(radius_put_string,	NULL)
-	PHP_FE(radius_put_int,	NULL)
-	PHP_FE(radius_put_attr,	NULL)
-	PHP_FE(radius_put_addr,	NULL)
-	PHP_FE(radius_put_vendor_string,	NULL)
-	PHP_FE(radius_put_vendor_int,	NULL)
-	PHP_FE(radius_put_vendor_attr,	NULL)
-	PHP_FE(radius_put_vendor_addr,	NULL)
-	PHP_FE(radius_send_request,	NULL)
-	PHP_FE(radius_get_attr,	NULL)
-	PHP_FE(radius_get_vendor_attr,	NULL)
-	PHP_FE(radius_cvt_addr,	NULL)
-	PHP_FE(radius_cvt_int,	NULL)
-	PHP_FE(radius_cvt_string,	NULL)
-	PHP_FE(radius_request_authenticator,	NULL)
-	PHP_FE(radius_server_secret,	NULL)
-	PHP_FE(radius_demangle,	NULL)    
-	PHP_FE(radius_demangle_mppe_key,	NULL)    
-	{NULL, NULL, NULL}	/* Must be the last line in radius_functions[] */
-};
-/* }}} */
-
-/* {{{ radius_module_entry
- */
-zend_module_entry radius_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
-	STANDARD_MODULE_HEADER,
-#endif
-	"radius",
-	radius_functions,
-	PHP_MINIT(radius),
-	PHP_MSHUTDOWN(radius),
-	NULL,
-	NULL,
-	PHP_MINFO(radius),
-#if ZEND_MODULE_API_NO >= 20010901
-	PHP_RADIUS_VERSION,
-#endif
-	STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-#ifdef COMPILE_DL_RADIUS
-ZEND_GET_MODULE(radius)
-#endif
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(radius)
-{
-	le_radius = zend_register_list_destructors_ex(_radius_close, NULL, "rad_handle", module_number);
-#include "radius_init_const.h"
-	REGISTER_LONG_CONSTANT("RADIUS_MPPE_KEY_LEN", MPPE_KEY_LEN, CONST_PERSISTENT);    
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(radius)
-{
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(radius)
-{
-	php_info_print_table_start();
-	php_info_print_table_header(2, "radius support", "enabled");
-	php_info_print_table_row(2, "version", PHP_RADIUS_VERSION);
-	php_info_print_table_end();
-}
-/* }}} */
-
-/* {{{ proto ressource radius_auth_open(string arg) */
-PHP_FUNCTION(radius_auth_open)
-{
-	radius_descriptor *raddesc;
-
-	raddesc = emalloc(sizeof(radius_descriptor));
-	raddesc->radh = rad_auth_open();
-
-	if (raddesc->radh != NULL) {
-		ZEND_REGISTER_RESOURCE(return_value, raddesc, le_radius);
-		raddesc->id = Z_LVAL_P(return_value);
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto ressource radius_acct_open(string arg) */
-PHP_FUNCTION(radius_acct_open)
-{
-	radius_descriptor *raddesc;
-
-	raddesc = emalloc(sizeof(radius_descriptor));
-	raddesc->radh = rad_acct_open();
-
-	if (raddesc->radh != NULL) {
-		ZEND_REGISTER_RESOURCE(return_value, raddesc, le_radius);
-		raddesc->id = Z_LVAL_P(return_value);
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_close(radh) */
-PHP_FUNCTION(radius_close)
-{
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-	zend_list_delete(raddesc->id);
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto string radius_strerror(radh) */
-PHP_FUNCTION(radius_strerror)
-{
-	char *msg;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-	msg = (char *)rad_strerror(raddesc->radh);
-	RETURN_STRINGL(msg, strlen(msg), 1);
-}
-/* }}} */
-
-/* {{{ proto bool radius_config(desc, configfile) */
-PHP_FUNCTION(radius_config)
-{
-	char *filename;
-	int filename_len;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &filename, &filename_len) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_config(raddesc->radh, filename) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_add_server(desc, hostname, port, secret, timeout, maxtries) */
-PHP_FUNCTION(radius_add_server)
-{
-	char *hostname, *secret;
-	int hostname_len, secret_len;
-	long  port, timeout, maxtries;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rslsll", &z_radh,
-		&hostname, &hostname_len,
-		&port,
-		&secret, &secret_len,
-		&timeout, &maxtries) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_add_server(raddesc->radh, hostname, port, secret, timeout, maxtries) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_create_request(desc, code) */
-PHP_FUNCTION(radius_create_request)
-{
-	long code;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &z_radh, &code) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_create_request(raddesc->radh, code) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_string(desc, type, str) */
-PHP_FUNCTION(radius_put_string)
-{
-	char *str;
-	int str_len;
-	long type;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &z_radh, &type, &str, &str_len)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_put_string(raddesc->radh, type, str) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_int(desc, type, int) */
-PHP_FUNCTION(radius_put_int)
-{
-	long type, val;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &z_radh, &type, &val)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_put_int(raddesc->radh, type, val) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_attr(desc, type, data) */
-PHP_FUNCTION(radius_put_attr)
-{
-	long type;
-	int len;
-	char *data;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &z_radh, &type, &data, &len)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_put_attr(raddesc->radh, type, data, len) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_addr(desc, type, addr) */
-PHP_FUNCTION(radius_put_addr)
-{
-	int addrlen;
-	long type;
-	char	*addr;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-	struct in_addr intern_addr;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &z_radh, &type, &addr, &addrlen)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (inet_aton(addr, &intern_addr) == 0) {
-		zend_error(E_ERROR, "Error converting Address");
-		RETURN_FALSE;
-	}
-
-	if (rad_put_addr(raddesc->radh, type, intern_addr) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_vendor_string(desc, vendor, type, str) */
-PHP_FUNCTION(radius_put_vendor_string)
-{
-	char *str;
-	int str_len;
-	long type, vendor;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlls", &z_radh, &vendor, &type, &str, &str_len)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_put_vendor_string(raddesc->radh, vendor, type, str) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_vendor_int(desc, vendor, type, int) */
-PHP_FUNCTION(radius_put_vendor_int)
-{
-	long type, vendor, val;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlll", &z_radh, &vendor, &type, &val)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_put_vendor_int(raddesc->radh, vendor, type, val) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_vendor_attr(desc, vendor, type, data) */
-PHP_FUNCTION(radius_put_vendor_attr)
-{
-	long type, vendor;
-	int len;
-	char *data;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlls", &z_radh, &vendor, &type,
-		&data, &len) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (rad_put_vendor_attr(raddesc->radh, vendor, type, data, len) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_put_vendor_addr(desc, vendor, type, addr) */
-PHP_FUNCTION(radius_put_vendor_addr)
-{
-	long type, vendor;
-	int addrlen;
-	char	*addr;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-	struct in_addr intern_addr;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlls", &z_radh, &vendor,
-		&type, &addr, &addrlen) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	if (inet_aton(addr, &intern_addr) == 0) {
-		zend_error(E_ERROR, "Error converting Address");
-		RETURN_FALSE;
-	}
-
-	if (rad_put_vendor_addr(raddesc->radh, vendor, type, intern_addr) == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_TRUE;
-	}
-}
-/* }}} */
-
-/* {{{ proto bool radius_send_request(desc) */
-PHP_FUNCTION(radius_send_request)
-{
-	radius_descriptor *raddesc;
-	zval *z_radh;
-	int res;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh)
-		== FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	res = rad_send_request(raddesc->radh);
-	if (res == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_LONG(res);
-	}
-}
-/* }}} */
-
-/* {{{ proto string radius_get_attr(desc) */
-PHP_FUNCTION(radius_get_attr)
-{
-	radius_descriptor *raddesc;
-	int res;
-	const void *data;
-	size_t len;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	res = rad_get_attr(raddesc->radh, &data, &len);
-	if (res == -1) {
-		RETURN_FALSE;
-	} else {
-		if (res > 0) {
-
-			array_init(return_value);
-			add_assoc_long(return_value, "attr", res);
-			add_assoc_stringl(return_value, "data", (char *) data, len, 1);
-			return;
-		}
-		RETURN_LONG(res);
-	}
-}
-/* }}} */
-
-/* {{{ proto string radius_get_vendor_attr(data) */
-PHP_FUNCTION(radius_get_vendor_attr)
-{
-	const void *data, *raw;
-	int len;
-	u_int32_t vendor;
-	unsigned char type;
-	size_t data_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &raw, &len) == FAILURE) {
-		return;
-	}
-
-	if (rad_get_vendor_attr(&vendor, &type, &data, &data_len, raw, len) == -1) {
-		RETURN_FALSE;
-	} else {
-
-		array_init(return_value);
-		add_assoc_long(return_value, "attr", type);
-		add_assoc_long(return_value, "vendor", vendor);
-		add_assoc_stringl(return_value, "data", (char *) data, data_len, 1);
-		return;
-	}
-}
-/* }}} */
-
-/* {{{ proto string radius_cvt_addr(data) */
-PHP_FUNCTION(radius_cvt_addr)
-{
-	const void *data;
-	char *addr_dot;
-	int len;
-	struct in_addr addr;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &len) == FAILURE) {
-		return;
-	}
-
-	addr = rad_cvt_addr(data);
-	addr_dot = inet_ntoa(addr);
-	RETURN_STRINGL(addr_dot, strlen(addr_dot), 1);
-}
-/* }}} */
-
-/* {{{ proto int radius_cvt_int(data) */
-PHP_FUNCTION(radius_cvt_int)
-{
-	const void *data;
-	int len, val;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &len)
-		== FAILURE) {
-		return;
-	}
-
-	val = rad_cvt_int(data);
-	RETURN_LONG(val);
-}
-/* }}} */
-
-/* {{{ proto string radius_cvt_string(data) */
-PHP_FUNCTION(radius_cvt_string)
-{
-	const void *data;
-	char *val;
-	int len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &len)
-		== FAILURE) {
-		return;
-	}
-
-	val = rad_cvt_string(data, len);
-	if (val == NULL) RETURN_FALSE;
-	RETVAL_STRINGL(val, strlen(val), 1);
-	free(val);
-	return;
-}
-/* }}} */
-
-/* {{{ proto string radius_request_authenticator(radh) */
-PHP_FUNCTION(radius_request_authenticator)
-{
-	radius_descriptor *raddesc;
-	ssize_t res;
-	char buf[LEN_AUTH];
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	res = rad_request_authenticator(raddesc->radh, buf, sizeof buf);
-	if (res == -1) {
-		RETURN_FALSE;
-	} else {
-		RETURN_STRINGL(buf, res, 1);
-	}
-}
-/* }}} */
-
-/* {{{ proto string radius_server_secret(radh) */
-PHP_FUNCTION(radius_server_secret)
-{
-	char *secret;
-	radius_descriptor *raddesc;
-	zval *z_radh;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-	secret = (char *)rad_server_secret(raddesc->radh);
-
-	if (secret) {
-		RETURN_STRINGL(secret, strlen(secret), 1);
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto string radius_demangle(radh, mangled) */
-PHP_FUNCTION(radius_demangle)
-{
-	radius_descriptor *raddesc;
-	zval *z_radh;
-	const void *mangled;
-	unsigned char *buf;
-	int len, res;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &mangled, &len) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	buf = emalloc(len);
-	res = rad_demangle(raddesc->radh, mangled, len, buf);
-
-	if (res == -1) {
-		efree(buf);
-		RETURN_FALSE;
-	} else {
-		RETVAL_STRINGL((char *) buf, len, 1);
-		efree(buf);
-		return;
-	}
-}
-/* }}} */
-
-/* {{{ proto string radius_demangle_mppe_key(radh, mangled) */
-PHP_FUNCTION(radius_demangle_mppe_key)
-{
-	radius_descriptor *raddesc;
-	zval *z_radh;
-	const void *mangled;
-	unsigned char *buf;
-	size_t dlen;
-	int len, res;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &mangled, &len) == FAILURE) {
-		return;
-	}
-
-	ZEND_FETCH_RESOURCE(raddesc, radius_descriptor *, &z_radh, -1, "rad_handle", le_radius);
-
-	buf = emalloc(len);
-	res = rad_demangle_mppe_key(raddesc->radh, mangled, len, buf, &dlen);
-	if (res == -1) {
-		efree(buf);
-		RETURN_FALSE;
-	} else {
-		RETVAL_STRINGL((char *) buf, dlen, 1);
-		efree(buf);
-		return;
-	}
-}
-/* }}} */
-
-/* {{{ _radius_close() */
-void _radius_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-	radius_descriptor *raddesc = (radius_descriptor *)rsrc->ptr;
-	rad_close(raddesc->radh);
-	efree(raddesc);
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=8 ts=8 fdm=marker
- * vim<600: noet sw=8 ts=8
- */
diff -Nru php-radius-1.2.7/radius-1.2.7/radius.conf php-radius-1.4.0~b1/radius-1.2.7/radius.conf
--- php-radius-1.2.7/radius-1.2.7/radius.conf	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radius.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# Service-type Server Shared-secret Timeout Retries
-#auth|acct host[:port] secret 3 3
-# A simple entry using all the defaults:
-#acct  radius1.domain.com  OurLittleSecret
-
-# A server still using the obsolete RADIUS port, with increased
-# timeout and maximum tries:
-#auth  auth.domain.com:1645  "I can't see you"  5  4
-
-# A server specified by its IP address:
-#auth  192.168.27.81  $X*#..38947ax-+=
\ No newline at end of file
diff -Nru php-radius-1.2.7/radius-1.2.7/radius.dsp php-radius-1.4.0~b1/radius-1.2.7/radius.dsp
--- php-radius-1.2.7/radius-1.2.7/radius.dsp	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radius.dsp	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-# Microsoft Developer Studio Project File - Name="radius" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=radius - Win32 Debug_TS
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "radius.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "radius.mak" CFG="radius - Win32 Debug_TS"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "radius - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "radius - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "radius - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "radius___Win32_Debug_TS"
-# PROP BASE Intermediate_Dir "radius___Win32_Debug_TS"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "_MBCS" /D "_USRDLL" /D "RADIUS_EXPORTS" /D HAVE_SOCKETS=1 /D ZEND_DEBUG=0 /D "PHP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_SOCKETS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_RADIUS=1 /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "_DEBUG"
-# ADD RSC /l 0xc07 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_radius.dll" /pdbtype:sept /libpath:"..\..\..\php4\Debug_TS"
-
-!ELSEIF  "$(CFG)" == "radius - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "radius___Win32_Release_TS"
-# PROP BASE Intermediate_Dir "radius___Win32_Release_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RADIUS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\\bindlib_w32" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_RADIUS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_RADIUS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "NDEBUG"
-# ADD RSC /l 0xc07 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_radius.dll" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "radius - Win32 Debug_TS"
-# Name "radius - Win32 Release_TS"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\radius.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib_compat.c
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\php_radius.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\radius_init_const.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib_compat.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib_md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib_private.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\radlib_vs.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff -Nru php-radius-1.2.7/radius-1.2.7/radius.dsw php-radius-1.4.0~b1/radius-1.2.7/radius.dsw
--- php-radius-1.2.7/radius-1.2.7/radius.dsw	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radius.dsw	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
-
-###############################################################################
-
-Project: "radius"=".\radius.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff -Nru php-radius-1.2.7/radius-1.2.7/radius_init_const.h php-radius-1.4.0~b1/radius-1.2.7/radius_init_const.h
--- php-radius-1.2.7/radius-1.2.7/radius_init_const.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radius_init_const.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-REGISTER_LONG_CONSTANT("RADIUS_ACCESS_REQUEST", 1, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCESS_ACCEPT", 2, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCESS_REJECT", 3, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_REQUEST", 4, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_RESPONSE", 5, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCESS_CHALLENGE", 11, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_USER_NAME", 1, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_USER_PASSWORD", 2, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_CHAP_PASSWORD", 3, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_NAS_IP_ADDRESS", 4, CONST_PERSISTENT);	/* IP address */
-REGISTER_LONG_CONSTANT("RADIUS_NAS_PORT", 5, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_SERVICE_TYPE", 6, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_LOGIN", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_FRAMED", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_LOGIN", 3, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_FRAMED", 4, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_OUTBOUND", 5, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ADMINISTRATIVE", 6, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_NAS_PROMPT", 7, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_AUTHENTICATE_ONLY", 8, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_NAS_PROMPT", 9, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_PROTOCOL", 7, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_PPP", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_SLIP", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ARAP", 3, CONST_PERSISTENT);	/* Appletalk */
-	REGISTER_LONG_CONSTANT("RADIUS_GANDALF", 4, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_XYLOGICS", 5, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IP_ADDRESS", 8, CONST_PERSISTENT);	/* IP address */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IP_NETMASK", 9, CONST_PERSISTENT);	/* IP address */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_ROUTING", 10, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_FILTER_ID", 11, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_MTU", 12, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_COMPRESSION", 13, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_COMP_NONE", 0, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_COMP_VJ", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_COMP_IPXHDR", 2, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_IP_HOST", 14, CONST_PERSISTENT);	/* IP address */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_SERVICE", 15, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_TCP_PORT", 16, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_REPLY_MESSAGE", 18, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_NUMBER", 19, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_ID", 20, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_ROUTE", 22, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPX_NETWORK", 23, CONST_PERSISTENT);	/* IP address */
-REGISTER_LONG_CONSTANT("RADIUS_STATE", 24, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_CLASS", 25, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_VENDOR_SPECIFIC", 26, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_SESSION_TIMEOUT", 27, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_IDLE_TIMEOUT", 28, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_TERMINATION_ACTION", 29, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_CALLED_STATION_ID", 30, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_CALLING_STATION_ID", 31, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_NAS_IDENTIFIER", 32, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_PROXY_STATE", 33, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_SERVICE", 34, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_NODE", 35, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_GROUP", 36, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_APPLETALK_LINK", 37, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_APPLETALK_NETWORK", 38, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_APPLETALK_ZONE", 39, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_CHAP_CHALLENGE", 60, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_NAS_PORT_TYPE", 61, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_ASYNC", 0, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_SYNC", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ISDN_SYNC", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ISDN_ASYNC_V120", 3, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ISDN_ASYNC_V110", 4, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_VIRTUAL", 5, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_PIAFS", 6, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_HDLC_CLEAR_CHANNEL", 7, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_X_25", 8, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_X_75", 9, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_G_3_FAX", 10, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_SDSL", 11, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ADSL_CAP", 12, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ADSL_DMT", 13, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_IDSL", 14, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ETHERNET", 15, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_XDSL", 16, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_CABLE", 17, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_WIRELESS_OTHER", 18, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_WIRELESS_IEEE_802_11", 19, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_PORT_LIMIT", 62, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_PORT", 63, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_CONNECT_INFO", 77, CONST_PERSISTENT);	/* String */
-
-REGISTER_LONG_CONSTANT("RADIUS_NAS_IPV6_ADDRESS", 95, CONST_PERSISTENT);		/* IPv6 address */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_INTERFACE_ID", 96, CONST_PERSISTENT);	/* 8 octets */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPV6_PREFIX", 97, CONST_PERSISTENT);		/* Octets */
-REGISTER_LONG_CONSTANT("RADIUS_LOGIN_IPV6_HOST", 98, CONST_PERSISTENT);		/* IPv6 address */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPV6_ROUTE", 99, CONST_PERSISTENT);		/* String */
-REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPV6_POOL", 100, CONST_PERSISTENT);		/* String */
-
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_STATUS_TYPE", 40, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_START", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_STOP", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_ON", 7, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_OFF", 8, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_DELAY_TIME", 41, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_INPUT_OCTETS", 42, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_OUTPUT_OCTETS", 43, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_SESSION_ID", 44, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_AUTHENTIC", 45, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_AUTH_RADIUS", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_AUTH_LOCAL", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_AUTH_REMOTE", 3, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_SESSION_TIME", 46, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_INPUT_PACKETS", 47, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_OUTPUT_PACKETS", 48, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_TERMINATE_CAUSE", 49, CONST_PERSISTENT);	/* Integer */
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_USER_REQUEST", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_LOST_CARRIER", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_LOST_SERVICE", 3, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_IDLE_TIMEOUT", 4, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_SESSION_TIMEOUT", 5, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_ADMIN_RESET", 6, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_ADMIN_REBOOT", 7, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_ERROR", 8, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_NAS_ERROR", 9, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_NAS_REQUEST", 10, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_NAS_REBOOT", 11, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_UNNEEDED", 12, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_PREEMPTED", 13, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_SUSPENDED", 14, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_SERVICE_UNAVAILABLE", 15, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_CALLBACK", 16, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_USER_ERROR", 17, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_TERM_HOST_REQUEST", 18, CONST_PERSISTENT);
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_MULTI_SESSION_ID", 50, CONST_PERSISTENT);	/* String */
-REGISTER_LONG_CONSTANT("RADIUS_ACCT_LINK_COUNT", 51, CONST_PERSISTENT);	/* Integer */
-REGISTER_LONG_CONSTANT("RADIUS_VENDOR_MICROSOFT", 311, CONST_PERSISTENT);		/* rfc2548 */
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_RESPONSE", 1, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_ERROR", 2, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_PW_1", 3, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_PW_2", 4, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_LM_ENC_PW", 5, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_NT_ENC_PW", 6, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY", 7, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES", 8, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_RAS_VENDOR", 9, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_DOMAIN", 10, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_CHALLENGE", 11, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_MPPE_KEYS", 12, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_BAP_USAGE", 13, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD", 14, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_LINK_DROP_TIME_LIMIT", 15, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_SEND_KEY", 16, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_RECV_KEY", 17, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_RAS_VERSION", 18, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_OLD_ARAP_PASSWORD", 19, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_NEW_ARAP_PASSWORD", 20, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON", 21, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_FILTER", 22, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ACCT_AUTH_TYPE", 23, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ACCT_EAP_TYPE", 24, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP2_RESPONSE", 25, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP2_SUCCESS", 26, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP2_PW", 27, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER", 28, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_SECONDARY_DNS_SERVER", 29, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_PRIMARY_NBNS_SERVER", 30, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_SECONDARY_NBNS_SERVER", 31, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ARAP_CHALLENGE", 33, CONST_PERSISTENT);
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib.c php-radius-1.4.0~b1/radius-1.2.7/radlib.c
--- php-radius-1.2.7/radius-1.2.7/radlib.c	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1128 +0,0 @@
-/*-
- * Copyright 1998 Juniper Networks, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$FreeBSD: src/lib/libradius/radlib.c,v 1.4.2.3 2002/06/17 02:24:57 brian Exp $
- */
-
-#include <sys/types.h>
-
-#ifndef PHP_WIN32
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#else
-#include <process.h>
-#include "win32/time.h"
-#endif
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef PHP_WIN32
-#include <unistd.h>
-#endif
-
-#include "radlib_compat.h"
-#include "radlib_md5.h"
-#include "radlib_private.h"
-
-static void	 clear_password(struct rad_handle *);
-static void	 generr(struct rad_handle *, const char *, ...)
-		    __printflike(2, 3);
-static void	 insert_scrambled_password(struct rad_handle *, int);
-static void	 insert_request_authenticator(struct rad_handle *, int);
-static int	 is_valid_response(struct rad_handle *, int,
-		    const struct sockaddr_in *);
-static int	 put_password_attr(struct rad_handle *, int,
-		    const void *, size_t);
-static int	 put_raw_attr(struct rad_handle *, int,
-		    const void *, size_t);
-static int	 split(char *, char *[], int, char *, size_t);
-
-static void
-clear_password(struct rad_handle *h)
-{
-	if (h->pass_len != 0) {
-		memset(h->pass, 0, h->pass_len);
-		h->pass_len = 0;
-	}
-	h->pass_pos = 0;
-}
-
-static void
-generr(struct rad_handle *h, const char *format, ...)
-{
-	va_list		 ap;
-
-	va_start(ap, format);
-	vsnprintf(h->errmsg, ERRSIZE, format, ap);
-	va_end(ap);
-}
-
-static void
-insert_scrambled_password(struct rad_handle *h, int srv)
-{
-	MD5_CTX ctx;
-	unsigned char md5[16];
-	const struct rad_server *srvp;
-	int padded_len;
-	int pos;
-
-	srvp = &h->servers[srv];
-	padded_len = h->pass_len == 0 ? 16 : (h->pass_len+15) & ~0xf;
-
-	memcpy(md5, &h->request[POS_AUTH], LEN_AUTH);
-	for (pos = 0;  pos < padded_len;  pos += 16) {
-		int i;
-
-		/* Calculate the new scrambler */
-		MD5Init(&ctx);
-		MD5Update(&ctx, srvp->secret, strlen(srvp->secret));
-		MD5Update(&ctx, md5, 16);
-		MD5Final(md5, &ctx);
-
-		/*
-		 * Mix in the current chunk of the password, and copy
-		 * the result into the right place in the request.  Also
-		 * modify the scrambler in place, since we will use this
-		 * in calculating the scrambler for next time.
-		 */
-		for (i = 0;  i < 16;  i++)
-			h->request[h->pass_pos + pos + i] =
-			    md5[i] ^= h->pass[pos + i];
-	}
-}
-
-static void
-insert_request_authenticator(struct rad_handle *h, int srv)
-{
-	MD5_CTX ctx;
-	const struct rad_server *srvp;
-
-	srvp = &h->servers[srv];
-
-	/* Create the request authenticator */
-	MD5Init(&ctx);
-	MD5Update(&ctx, &h->request[POS_CODE], POS_AUTH - POS_CODE);
-	MD5Update(&ctx, memset(&h->request[POS_AUTH], 0, LEN_AUTH), LEN_AUTH);
-	MD5Update(&ctx, &h->request[POS_ATTRS], h->req_len - POS_ATTRS);
-	MD5Update(&ctx, srvp->secret, strlen(srvp->secret));
-	MD5Final(&h->request[POS_AUTH], &ctx);
-}
-
-/*
- * Return true if the current response is valid for a request to the
- * specified server.
- */
-static int
-is_valid_response(struct rad_handle *h, int srv,
-    const struct sockaddr_in *from)
-{
-	MD5_CTX ctx;
-	unsigned char md5[16];
-	const struct rad_server *srvp;
-	int len;
-
-	srvp = &h->servers[srv];
-
-	/* Check the source address */
-	if (from->sin_family != srvp->addr.sin_family ||
-	    from->sin_addr.s_addr != srvp->addr.sin_addr.s_addr ||
-	    from->sin_port != srvp->addr.sin_port)
-		return 0;
-
-	/* Check the message length */
-	if (h->resp_len < POS_ATTRS)
-		return 0;
-	len = h->response[POS_LENGTH] << 8 | h->response[POS_LENGTH+1];
-	if (len > h->resp_len)
-		return 0;
-
-	/* Check the response authenticator */
-	MD5Init(&ctx);
-	MD5Update(&ctx, &h->response[POS_CODE], POS_AUTH - POS_CODE);
-	MD5Update(&ctx, &h->request[POS_AUTH], LEN_AUTH);
-	MD5Update(&ctx, &h->response[POS_ATTRS], len - POS_ATTRS);
-	MD5Update(&ctx, srvp->secret, strlen(srvp->secret));
-	MD5Final(md5, &ctx);
-	if (memcmp(&h->response[POS_AUTH], md5, sizeof md5) != 0)
-		return 0;
-
-	return 1;
-}
-
-static int
-put_password_attr(struct rad_handle *h, int type, const void *value, size_t len)
-{
-	int padded_len;
-	int pad_len;
-
-	if (h->pass_pos != 0) {
-		generr(h, "Multiple User-Password attributes specified");
-		return -1;
-	}
-	if (len > PASSSIZE)
-		len = PASSSIZE;
-	padded_len = len == 0 ? 16 : (len+15) & ~0xf;
-	pad_len = padded_len - len;
-
-	/*
-	 * Put in a place-holder attribute containing all zeros, and
-	 * remember where it is so we can fill it in later.
-	 */
-	clear_password(h);
-	put_raw_attr(h, type, h->pass, padded_len);
-	h->pass_pos = h->req_len - padded_len;
-
-	/* Save the cleartext password, padded as necessary */
-	memcpy(h->pass, value, len);
-	h->pass_len = len;
-	memset(h->pass + len, 0, pad_len);
-	return 0;
-}
-
-static int
-put_raw_attr(struct rad_handle *h, int type, const void *value, size_t len)
-{
-	if (len > 253) {
-		generr(h, "Attribute too long");
-		return -1;
-	}
-	
-	if (h->req_len + 2 + len > MSGSIZE) {
-		generr(h, "Maximum message length exceeded");
-		return -1;
-	}
-	h->request[h->req_len++] = type;
-	h->request[h->req_len++] = len + 2;
-	memcpy(&h->request[h->req_len], value, len);
-	h->req_len += len;
-	return 0;
-}
-
-int
-rad_add_server(struct rad_handle *h, const char *host, int port,
-    const char *secret, int timeout, int tries)
-{
-	struct rad_server *srvp;
-
-	if (h->num_servers >= MAXSERVERS) {
-		generr(h, "Too many RADIUS servers specified");
-		return -1;
-	}
-	srvp = &h->servers[h->num_servers];
-
-	memset(&srvp->addr, 0, sizeof srvp->addr);
-	srvp->addr.sin_family = AF_INET;
-	if (!inet_aton(host, &srvp->addr.sin_addr)) {
-		struct hostent *hent;
-
-		if ((hent = gethostbyname(host)) == NULL) {
-			generr(h, "%s: host not found", host);
-			return -1;
-		}
-		memcpy(&srvp->addr.sin_addr, hent->h_addr,
-		    sizeof srvp->addr.sin_addr);
-	}
-	if (port != 0)
-		srvp->addr.sin_port = htons((short) port);
-	else {
-		struct servent *sent;
-
-		if (h->type == RADIUS_AUTH)
-			srvp->addr.sin_port =
-			    (sent = getservbyname("radius", "udp")) != NULL ?
-				sent->s_port : htons(RADIUS_PORT);
-		else
-			srvp->addr.sin_port =
-			    (sent = getservbyname("radacct", "udp")) != NULL ?
-				sent->s_port : htons(RADACCT_PORT);
-	}
-	if ((srvp->secret = strdup(secret)) == NULL) {
-		generr(h, "Out of memory");
-		return -1;
-	}
-	srvp->timeout = timeout;
-	srvp->max_tries = tries;
-	srvp->num_tries = 0;
-	h->num_servers++;
-	return 0;
-}
-
-void
-rad_close(struct rad_handle *h)
-{
-	int srv;
-
-	if (h->fd != -1)
-		close(h->fd);
-	for (srv = 0;  srv < h->num_servers;  srv++) {
-		memset(h->servers[srv].secret, 0,
-		    strlen(h->servers[srv].secret));
-		free(h->servers[srv].secret);
-	}
-	clear_password(h);
-	free(h);
-}
-
-int
-rad_config(struct rad_handle *h, const char *path)
-{
-	FILE *fp;
-	char buf[MAXCONFLINE];
-	int linenum;
-	int retval;
-
-	if (path == NULL)
-		path = PATH_RADIUS_CONF;
-	if ((fp = fopen(path, "r")) == NULL) {
-		generr(h, "Cannot open \"%s\": %s", path, strerror(errno));
-		return -1;
-	}
-	retval = 0;
-	linenum = 0;
-	while (fgets(buf, sizeof buf, fp) != NULL) {
-		int len;
-		char *fields[5];
-		int nfields;
-		char msg[ERRSIZE];
-		char *type;
-		char *host, *res;
-		char *port_str;
-		char *secret;
-		char *timeout_str;
-		char *maxtries_str;
-		char *end;
-		char *wanttype;
-		unsigned long timeout;
-		unsigned long maxtries;
-		int port;
-		int i;
-
-		linenum++;
-		len = strlen(buf);
-		/* We know len > 0, else fgets would have returned NULL. */
-		if (buf[len - 1] != '\n' && !(buf[len - 2] != '\r' && buf[len - 1] != '\n')) {
-			if (len == sizeof buf - 1)
-				generr(h, "%s:%d: line too long", path,
-				    linenum);
-			else
-				generr(h, "%s:%d: missing newline", path,
-				    linenum);
-			retval = -1;
-			break;
-		}
-		buf[len - 1] = '\0';
-
-		/* Extract the fields from the line. */
-		nfields = split(buf, fields, 5, msg, sizeof msg);
-		if (nfields == -1) {
-			generr(h, "%s:%d: %s", path, linenum, msg);
-			retval = -1;
-			break;
-		}
-		if (nfields == 0)
-			continue;
-		/*
-		 * The first field should contain "auth" or "acct" for
-		 * authentication or accounting, respectively.  But older
-		 * versions of the file didn't have that field.  Default
-		 * it to "auth" for backward compatibility.
-		 */
-		if (strcmp(fields[0], "auth") != 0 &&
-		    strcmp(fields[0], "acct") != 0) {
-			if (nfields >= 5) {
-				generr(h, "%s:%d: invalid service type", path,
-				    linenum);
-				retval = -1;
-				break;
-			}
-			nfields++;
-			for (i = nfields;  --i > 0;  )
-				fields[i] = fields[i - 1];
-			fields[0] = "auth";
-		}
-		if (nfields < 3) {
-			generr(h, "%s:%d: missing shared secret", path,
-			    linenum);
-			retval = -1;
-			break;
-		}
-		type = fields[0];
-		host = fields[1];
-		secret = fields[2];
-		timeout_str = fields[3];
-		maxtries_str = fields[4];
-
-		/* Ignore the line if it is for the wrong service type. */
-		wanttype = h->type == RADIUS_AUTH ? "auth" : "acct";
-		if (strcmp(type, wanttype) != 0)
-			continue;
-
-		/* Parse and validate the fields. */
-		res = host;
-		host = strsep(&res, ":");
-		port_str = strsep(&res, ":");
-		if (port_str != NULL) {
-			port = strtoul(port_str, &end, 10);
-			if (*end != '\0') {
-				generr(h, "%s:%d: invalid port", path,
-				    linenum);
-				retval = -1;
-				break;
-			}
-		} else
-			port = 0;
-		if (timeout_str != NULL) {
-			timeout = strtoul(timeout_str, &end, 10);
-			if (*end != '\0') {
-				generr(h, "%s:%d: invalid timeout", path,
-				    linenum);
-				retval = -1;
-				break;
-			}
-		} else
-			timeout = TIMEOUT;
-		if (maxtries_str != NULL) {
-			maxtries = strtoul(maxtries_str, &end, 10);
-			if (*end != '\0') {
-				generr(h, "%s:%d: invalid maxtries", path,
-				    linenum);
-				retval = -1;
-				break;
-			}
-		} else
-			maxtries = MAXTRIES;
-
-		if (rad_add_server(h, host, port, secret, timeout, maxtries) ==
-		    -1) {
-			strcpy(msg, h->errmsg);
-			generr(h, "%s:%d: %s", path, linenum, msg);
-			retval = -1;
-			break;
-		}
-	}
-	/* Clear out the buffer to wipe a possible copy of a shared secret */
-	memset(buf, 0, sizeof buf);
-	fclose(fp);
-	return retval;
-}
-
-/*
- * rad_init_send_request() must have previously been called.
- * Returns:
- *   0     The application should select on *fd with a timeout of tv before
- *         calling rad_continue_send_request again.
- *   < 0   Failure
- *   > 0   Success
- */
-int
-rad_continue_send_request(struct rad_handle *h, int selected, int *fd,
-                          struct timeval *tv)
-{
-	int n;
-
-	if (selected) {
-		struct sockaddr_in from;
-		int fromlen;
-
-		fromlen = sizeof from;
-		h->resp_len = recvfrom(h->fd, h->response,
-		    MSGSIZE, MSG_WAITALL, (struct sockaddr *)&from, &fromlen);
-		if (h->resp_len == -1) {
-#ifdef PHP_WIN32
-			generr(h, "recfrom: %d", WSAGetLastError());
-#else
-			generr(h, "recvfrom: %s", strerror(errno));
-#endif
-			return -1;
-		}
-		if (is_valid_response(h, h->srv, &from)) {
-			h->resp_len = h->response[POS_LENGTH] << 8 |
-			    h->response[POS_LENGTH+1];
-			h->resp_pos = POS_ATTRS;
-			return h->response[POS_CODE];
-		}
-	}
-
-	if (h->try == h->total_tries) {
-		generr(h, "No valid RADIUS responses received");
-		return -1;
-	}
-
-	/*
-         * Scan round-robin to the next server that has some
-         * tries left.  There is guaranteed to be one, or we
-         * would have exited this loop by now.
-	 */
-	while (h->servers[h->srv].num_tries >= h->servers[h->srv].max_tries)
-		if (++h->srv >= h->num_servers)
-			h->srv = 0;
-
-	if (h->request[POS_CODE] == RAD_ACCOUNTING_REQUEST)
-		/* Insert the request authenticator into the request */
-		insert_request_authenticator(h, h->srv);
-	else
-		/* Insert the scrambled password into the request */
-		if (h->pass_pos != 0)
-			insert_scrambled_password(h, h->srv);
-
-	/* Send the request */
-	n = sendto(h->fd, h->request, h->req_len, 0,
-	    (const struct sockaddr *)&h->servers[h->srv].addr,
-	    sizeof h->servers[h->srv].addr);
-	if (n != h->req_len) {
-		if (n == -1)
-#ifdef PHP_WIN32
-			generr(h, "sendto: %d", WSAGetLastError());
-#else
-			generr(h, "sendto: %s", strerror(errno));
-#endif
-		else
-			generr(h, "sendto: short write");
-		return -1;
-	}
-
-	h->try++;
-	h->servers[h->srv].num_tries++;
-	tv->tv_sec = h->servers[h->srv].timeout;
-	tv->tv_usec = 0;
-	*fd = h->fd;
-
-	return 0;
-}
-
-int
-rad_create_request(struct rad_handle *h, int code)
-{
-	int i;
-
-	h->request[POS_CODE] = code;
-	h->request[POS_IDENT] = ++h->ident;
-	/* Create a random authenticator */
-	for (i = 0;  i < LEN_AUTH;  i += 2) {
-		long r;
-		TSRMLS_FETCH();
-		r = php_rand(TSRMLS_C);
-		h->request[POS_AUTH+i] = (unsigned char) r;
-		h->request[POS_AUTH+i+1] = (unsigned char) (r >> 8);
-	}
-	h->req_len = POS_ATTRS;
-	h->request_created = 1;    
-	clear_password(h);
-	return 0;
-}
-
-struct in_addr
-rad_cvt_addr(const void *data)
-{
-	struct in_addr value;
-
-	memcpy(&value.s_addr, data, sizeof value.s_addr);
-	return value;
-}
-
-u_int32_t
-rad_cvt_int(const void *data)
-{
-	u_int32_t value;
-
-	memcpy(&value, data, sizeof value);
-	return ntohl(value);
-}
-
-char *
-rad_cvt_string(const void *data, size_t len)
-{
-	char *s;
-
-	s = malloc(len + 1);
-	if (s != NULL) {
-		memcpy(s, data, len);
-		s[len] = '\0';
-	}
-	return s;
-}
-
-/*
- * Returns the attribute type.  If none are left, returns 0.  On failure,
- * returns -1.
- */
-int
-rad_get_attr(struct rad_handle *h, const void **value, size_t *len)
-{
-	int type;
-
-	if (h->resp_len == 0) {
-		generr(h, "No response has been received");
-		return -1;
-	}
-	if (h->resp_pos >= h->resp_len)
-		return 0;
-	if (h->resp_pos + 2 > h->resp_len) {
-		generr(h, "Malformed attribute in response");
-		return -1;
-	}
-	type = h->response[h->resp_pos++];
-	*len = h->response[h->resp_pos++] - 2;
-	if (h->resp_pos + (int) *len > h->resp_len) {
-		generr(h, "Malformed attribute in response");
-		return -1;
-	}
-	*value = &h->response[h->resp_pos];
-	h->resp_pos += *len;
-	return type;
-}
-
-/*
- * Returns -1 on error, 0 to indicate no event and >0 for success
- */
-int
-rad_init_send_request(struct rad_handle *h, int *fd, struct timeval *tv)
-{
-	int srv;
-
-	/* Make sure we have a socket to use */
-	if (h->fd == -1) {
-		struct sockaddr_in sin;
-
-		if ((h->fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
-#ifdef PHP_WIN32
-			generr(h, "Cannot create socket: %d", WSAGetLastError());
-#else
-			generr(h, "Cannot create socket: %s", strerror(errno));
-#endif
-			return -1;
-		}
-		memset(&sin, 0, sizeof sin);
-		sin.sin_family = AF_INET;
-		sin.sin_addr.s_addr = INADDR_ANY;
-		sin.sin_port = htons(0);
-		if (bind(h->fd, (const struct sockaddr *)&sin,
-		    sizeof sin) == -1) {
-#ifdef PHP_WIN32
-			generr(h, "bind: %d", WSAGetLastError());
-#else
-			generr(h, "bind: %s", strerror(errno));
-#endif
-			close(h->fd);
-			h->fd = -1;
-			return -1;
-		}
-	}
-
-	if (h->request[POS_CODE] == RAD_ACCOUNTING_REQUEST) {
-		/* Make sure no password given */
-		if (h->pass_pos || h->chap_pass) {
-			generr(h, "User or Chap Password in accounting request");
-			return -1;
-		}
-	} else {
-		/* Make sure the user gave us a password */
-		if (h->pass_pos == 0 && !h->chap_pass) {
-			generr(h, "No User or Chap Password attributes given");
-			return -1;
-		}
-		if (h->pass_pos != 0 && h->chap_pass) {
-			generr(h, "Both User and Chap Password attributes given");
-			return -1;
-		}
-	}
-
-	/* Fill in the length field in the message */
-	h->request[POS_LENGTH] = h->req_len >> 8;
-	h->request[POS_LENGTH+1] = h->req_len;
-
-	/*
-	 * Count the total number of tries we will make, and zero the
-	 * counter for each server.
-	 */
-	h->total_tries = 0;
-	for (srv = 0;  srv < h->num_servers;  srv++) {
-		h->total_tries += h->servers[srv].max_tries;
-		h->servers[srv].num_tries = 0;
-	}
-	if (h->total_tries == 0) {
-		generr(h, "No RADIUS servers specified");
-		return -1;
-	}
-
-	h->try = h->srv = 0;
-
-	return rad_continue_send_request(h, 0, fd, tv);
-}
-
-/*
- * Create and initialize a rad_handle structure, and return it to the
- * caller.  Can fail only if the necessary memory cannot be allocated.
- * In that case, it returns NULL.
- */
-struct rad_handle *
-rad_auth_open(void)
-{
-	struct rad_handle *h;
-
-	h = (struct rad_handle *)malloc(sizeof(struct rad_handle));
-	if (h != NULL) {
-		TSRMLS_FETCH();
-		php_srand(time(NULL) * getpid() * (unsigned long) (php_combined_lcg(TSRMLS_C) * 10000.0) TSRMLS_CC);
-		h->fd = -1;
-		h->num_servers = 0;
-		h->ident = php_rand(TSRMLS_C);
-		h->errmsg[0] = '\0';
-		memset(h->request, 0, sizeof h->request);
-		h->req_len = 0;
-		memset(h->pass, 0, sizeof h->pass);
-		h->pass_len = 0;
-		h->pass_pos = 0;
-		h->chap_pass = 0;
-		h->type = RADIUS_AUTH;
-		h->request_created = 0;        
-		h->resp_len = 0;
-		h->srv = 0;
-	}
-	return h;
-}
-
-struct rad_handle *
-rad_acct_open(void)
-{
-	struct rad_handle *h;
-
-	h = rad_open();
-	if (h != NULL)
-	        h->type = RADIUS_ACCT;
-	return h;
-}
-
-struct rad_handle *
-rad_open(void)
-{
-    return rad_auth_open();
-}
-
-int
-rad_put_addr(struct rad_handle *h, int type, struct in_addr addr)
-{
-	return rad_put_attr(h, type, &addr.s_addr, sizeof addr.s_addr);
-}
-
-int
-rad_put_attr(struct rad_handle *h, int type, const void *value, size_t len)
-{
-	int result;
-
-    if (!h->request_created) {
-        generr(h, "Please call rad_create_request()");
-        return -1;
-    }
-
-	if (type == RAD_USER_PASSWORD)
-		result = put_password_attr(h, type, value, len);
-	else {
-		result = put_raw_attr(h, type, value, len);
-		if (result == 0 && type == RAD_CHAP_PASSWORD)
-			h->chap_pass = 1;
-	}
-
-	return result;
-}
-
-int
-rad_put_int(struct rad_handle *h, int type, u_int32_t value)
-{
-	u_int32_t nvalue;
-
-	nvalue = htonl(value);
-	return rad_put_attr(h, type, &nvalue, sizeof nvalue);
-}
-
-int
-rad_put_string(struct rad_handle *h, int type, const char *str)
-{
-	return rad_put_attr(h, type, str, strlen(str));
-}
-
-/*
- * Returns the response type code on success, or -1 on failure.
- */
-int
-rad_send_request(struct rad_handle *h)
-{
-	struct timeval timelimit;
-	struct timeval tv;
-	int fd;
-	int n;
-
-	n = rad_init_send_request(h, &fd, &tv);
-
-	if (n != 0)
-		return n;
-
-	gettimeofday(&timelimit, NULL);
-	timeradd(&tv, &timelimit, &timelimit);
-
-	for ( ; ; ) {
-		fd_set readfds;
-
-		FD_ZERO(&readfds);
-		FD_SET(fd, &readfds);
-
-		n = select(fd + 1, &readfds, NULL, NULL, &tv);
-
-		if (n == -1) {
-			generr(h, "select: %s", strerror(errno));
-			return -1;
-		}
-
-		if (!FD_ISSET(fd, &readfds)) {
-			/* Compute a new timeout */
-			gettimeofday(&tv, NULL);
-			timersub(&timelimit, &tv, &tv);
-			if (tv.tv_sec > 0 || (tv.tv_sec == 0 && tv.tv_usec > 0))
-				/* Continue the select */
-				continue;
-		}
-
-		n = rad_continue_send_request(h, n, &fd, &tv);
-
-		if (n != 0)
-			return n;
-
-		gettimeofday(&timelimit, NULL);
-		timeradd(&tv, &timelimit, &timelimit);
-	}
-}
-
-const char *
-rad_strerror(struct rad_handle *h)
-{
-	return h->errmsg;
-}
-
-/*
- * Destructively split a string into fields separated by white space.
- * `#' at the beginning of a field begins a comment that extends to the
- * end of the string.  Fields may be quoted with `"'.  Inside quoted
- * strings, the backslash escapes `\"' and `\\' are honored.
- *
- * Pointers to up to the first maxfields fields are stored in the fields
- * array.  Missing fields get NULL pointers.
- *
- * The return value is the actual number of fields parsed, and is always
- * <= maxfields.
- *
- * On a syntax error, places a message in the msg string, and returns -1.
- */
-static int
-split(char *str, char *fields[], int maxfields, char *msg, size_t msglen)
-{
-	char *p;
-	int i;
-	static const char ws[] = " \t";
-
-	for (i = 0;  i < maxfields;  i++)
-		fields[i] = NULL;
-	p = str;
-	i = 0;
-	while (*p != '\0') {
-		p += strspn(p, ws);
-		if (*p == '#' || *p == '\0')
-			break;
-		if (i >= maxfields) {
-			snprintf(msg, msglen, "line has too many fields");
-			return -1;
-		}
-		if (*p == '"') {
-			char *dst;
-
-			dst = ++p;
-			fields[i] = dst;
-			while (*p != '"') {
-				if (*p == '\\') {
-					p++;
-					if (*p != '"' && *p != '\\' &&
-					    *p != '\0') {
-						snprintf(msg, msglen,
-						    "invalid `\\' escape");
-						return -1;
-					}
-				}
-				if (*p == '\0') {
-					snprintf(msg, msglen,
-					    "unterminated quoted string");
-					return -1;
-				}
-				*dst++ = *p++;
-			}
-			*dst = '\0';
-			p++;
-			if (*fields[i] == '\0') {
-				snprintf(msg, msglen,
-				    "empty quoted string not permitted");
-				return -1;
-			}
-			if (*p != '\0' && strspn(p, ws) == 0) {
-				snprintf(msg, msglen, "quoted string not"
-				    " followed by white space");
-				return -1;
-			}
-		} else {
-			fields[i] = p;
-			p += strcspn(p, ws);
-			if (*p != '\0')
-				*p++ = '\0';
-		}
-		i++;
-	}
-	return i;
-}
-
-int
-rad_get_vendor_attr(u_int32_t *vendor, unsigned char *type, const void **data, size_t *len, const void *raw, size_t raw_len)
-{
-	struct vendor_attribute *attr;
-
-	if (raw_len < sizeof(struct vendor_attribute)) {
-		return -1;
-	}
-
-	attr = (struct vendor_attribute *) raw;
-	*vendor = ntohl(attr->vendor_value);
-	*type = attr->attrib_type;
-	*data = attr->attrib_data;
-	*len = attr->attrib_len - 2;
-
-	if ((attr->attrib_len + 4) > raw_len) {
-		return -1;
-	}
-
-	return (attr->attrib_type);
-}
-
-int
-rad_put_vendor_addr(struct rad_handle *h, int vendor, int type,
-    struct in_addr addr)
-{
-	return (rad_put_vendor_attr(h, vendor, type, &addr.s_addr,
-	    sizeof addr.s_addr));
-}
-
-int
-rad_put_vendor_attr(struct rad_handle *h, int vendor, int type,
-    const void *value, size_t len)
-{
-	struct vendor_attribute *attr;
-	int res;
-    
-    if (!h->request_created) {
-        generr(h, "Please call rad_create_request()");
-        return -1;
-    }    
-
-	if ((attr = malloc(len + 6)) == NULL) {
-		generr(h, "malloc failure (%d bytes)", len + 6);
-		return -1;
-	}
-
-	attr->vendor_value = htonl(vendor);
-	attr->attrib_type = type;
-	attr->attrib_len = len + 2;
-	memcpy(attr->attrib_data, value, len);
-
-	res = put_raw_attr(h, RAD_VENDOR_SPECIFIC, attr, len + 6);
-	free(attr);
-	if (res == 0 && vendor == RAD_VENDOR_MICROSOFT
-	    && (type == RAD_MICROSOFT_MS_CHAP_RESPONSE
-	    || type == RAD_MICROSOFT_MS_CHAP2_RESPONSE)) {
-		h->chap_pass = 1;
-	}
-	return (res);
-}
-
-int
-rad_put_vendor_int(struct rad_handle *h, int vendor, int type, u_int32_t i)
-{
-	u_int32_t value;
-
-	value = htonl(i);
-	return (rad_put_vendor_attr(h, vendor, type, &value, sizeof value));
-}
-
-int
-rad_put_vendor_string(struct rad_handle *h, int vendor, int type,
-    const char *str)
-{
-	return (rad_put_vendor_attr(h, vendor, type, str, strlen(str)));
-}
-
-ssize_t
-rad_request_authenticator(struct rad_handle *h, char *buf, size_t len)
-{
-	if (len < LEN_AUTH)
-		return (-1);
-	memcpy(buf, h->request + POS_AUTH, LEN_AUTH);
-	if (len > LEN_AUTH)
-		buf[LEN_AUTH] = '\0';
-	return (LEN_AUTH);
-}
-
-const char *
-rad_server_secret(struct rad_handle *h)
-{
-	if (h->srv >= h->num_servers) {
-		generr(h, "No RADIUS servers specified");
-		return NULL;
-	}
-
-	return (h->servers[h->srv].secret);
-}
-
-int
-rad_demangle(struct rad_handle *h, const void *mangled, size_t mlen, u_char *demangled) 
-{
-	char R[LEN_AUTH];
-	const char *S;
-	int i, Ppos;
-	MD5_CTX Context;
-	u_char b[16], *C;
-
-	if ((mlen % 16 != 0) || (mlen > 128)) {
-		generr(h, "Cannot interpret mangled data of length %ld", (u_long)mlen);
-		return -1;
-	}
-
-	C = (u_char *)mangled;
-
-	/* We need the shared secret as Salt */
-	S = rad_server_secret(h);
-
-	/* We need the request authenticator */
-	if (rad_request_authenticator(h, R, sizeof R) != LEN_AUTH) {
-		generr(h, "Cannot obtain the RADIUS request authenticator");
-                return -1;
-	}
-
-	MD5Init(&Context);
-	MD5Update(&Context, S, strlen(S));
-	MD5Update(&Context, R, LEN_AUTH);
-	MD5Final(b, &Context);
-	Ppos = 0;
-	while (mlen) {
-
-		mlen -= 16;
-		for (i = 0; i < 16; i++)
-			demangled[Ppos++] = C[i] ^ b[i];
-
-		if (mlen) {
-			MD5Init(&Context);
-			MD5Update(&Context, S, strlen(S));
-			MD5Update(&Context, C, 16);
-			MD5Final(b, &Context);
-		}
-
-		C += 16;
-	}
-
-	return 0;
-}
-
-int
-rad_demangle_mppe_key(struct rad_handle *h, const void *mangled, size_t mlen, u_char *demangled, size_t *len)
-{
-	char R[LEN_AUTH];    /* variable names as per rfc2548 */
-	const char *S;
-	u_char b[16];
-	const u_char *A, *C;
-	MD5_CTX Context;
-	int Slen, i, Clen, Ppos;
-	u_char *P;
-
-	if (mlen % 16 != SALT_LEN) {
-		generr(h, "Cannot interpret mangled data of length %ld", (u_long)mlen);
-		return -1;
-	}
-
-	/* We need the RADIUS Request-Authenticator */
-	if (rad_request_authenticator(h, R, sizeof R) != LEN_AUTH) {
-		generr(h, "Cannot obtain the RADIUS request authenticator");
-		return -1;
-	}
-
-	A = (const u_char *)mangled;      /* Salt comes first */
-	C = (const u_char *)mangled + SALT_LEN;  /* Then the ciphertext */
-	Clen = mlen - SALT_LEN;
-	S = rad_server_secret(h);    /* We need the RADIUS secret */
-	Slen = strlen(S);
-	P = alloca(Clen);        /* We derive our plaintext */
-
-	MD5Init(&Context);
-	MD5Update(&Context, S, Slen);
-	MD5Update(&Context, R, LEN_AUTH);
-	MD5Update(&Context, A, SALT_LEN);
-	MD5Final(b, &Context);
-	Ppos = 0;
-
-	while (Clen) {
-		Clen -= 16;
-
-		for (i = 0; i < 16; i++)
-		    P[Ppos++] = C[i] ^ b[i];
-
-		if (Clen) {
-			MD5Init(&Context);
-			MD5Update(&Context, S, Slen);
-			MD5Update(&Context, C, 16);
-			MD5Final(b, &Context);
-		}
-                
-		C += 16;
-	}
-
-	/*
-	* The resulting plain text consists of a one-byte length, the text and
-	* maybe some padding.
-	*/
-	*len = *P;
-	if (*len > mlen - 1) {
-		generr(h, "Mangled data seems to be garbage %d %d", *len, mlen-1);        
-		return -1;
-	}
-
-	if (*len > MPPE_KEY_LEN) {
-		generr(h, "Key to long (%d) for me max. %d", *len, MPPE_KEY_LEN);        
-		return -1;
-	}
-
-	memcpy(demangled, P + 1, *len);
-	return 0;
-}
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib_compat.c php-radius-1.4.0~b1/radius-1.2.7/radlib_compat.c
--- php-radius-1.2.7/radius-1.2.7/radlib_compat.c	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib_compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-#include <stddef.h>
-#include "php.h"
-#include "time.h"
-
-int inet_aton(const char *cp, struct in_addr *inp) 
-{
-	inp->s_addr = inet_addr(cp);
-
-	if (inp->s_addr == INADDR_NONE) {
-		return 0;
-	}
-
-	return 1;
-}
-
-char *strsep(char **stringp,	const char *delim) 
-{
-	char *s;
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib_compat.h php-radius-1.4.0~b1/radius-1.2.7/radlib_compat.h
--- php-radius-1.2.7/radius-1.2.7/radlib_compat.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib_compat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-#ifndef _RADLIB_COMPAT_H_
-#define _RADLIB_COMPAT_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "ext/standard/php_rand.h"
-#include "ext/standard/php_standard.h"
-
-#define MPPE_KEY_LEN    16
-
-#ifndef HAVE_U_INT32_T
-typedef unsigned int u_int32_t;
-#endif
-
-#ifdef PHP_WIN32
-typedef long ssize_t;
-int inet_aton(const char *cp, struct in_addr *inp);
-char *strsep(char **stringp,	const char *delim);
-#define MSG_WAITALL 0
-#include "php_network.h"
-#endif
-
-#ifndef __printflike
-#define	__printflike(fmtarg, firstvararg)
-#endif
-
-#ifndef timeradd
-#define timeradd(tvp, uvp, vvp)		\
-	do {		\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;		\
-		if ((vvp)->tv_usec >= 1000000) {		\
-			(vvp)->tv_sec++;		\
-			(vvp)->tv_usec -= 1000000;		\
-		}		\
-	} while (0)
-#endif
-
-#ifndef timersub
-#define timersub(tvp, uvp, vvp)		\
-	do {		\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;		\
-		if ((vvp)->tv_usec < 0) {		\
-			(vvp)->tv_sec--;		\
-			(vvp)->tv_usec += 1000000;		\
-		}		\
-	} while (0)
-#endif
-
-#endif
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib.h php-radius-1.4.0~b1/radius-1.2.7/radlib.h
--- php-radius-1.2.7/radius-1.2.7/radlib.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,207 +0,0 @@
-/*-
- * Copyright 1998 Juniper Networks, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$FreeBSD: src/lib/libradius/radlib.h,v 1.3.2.1 2002/06/17 02:24:57 brian Exp $
- */
-
-#ifndef _RADLIB_H_
-#define _RADLIB_H_
-
-#ifndef PHP_WIN32
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include "radlib_compat.h"
-
-/* Message types */
-#define RAD_ACCESS_REQUEST		1
-#define RAD_ACCESS_ACCEPT		2
-#define RAD_ACCESS_REJECT		3
-#define RAD_ACCOUNTING_REQUEST		4
-#define RAD_ACCOUNTING_RESPONSE		5
-#define RAD_ACCESS_CHALLENGE		11
-
-/* Attribute types and values */
-#define RAD_USER_NAME			1	/* String */
-#define RAD_USER_PASSWORD		2	/* String */
-#define RAD_CHAP_PASSWORD		3	/* String */
-#define RAD_NAS_IP_ADDRESS		4	/* IP address */
-#define RAD_NAS_PORT			5	/* Integer */
-#define RAD_SERVICE_TYPE		6	/* Integer */
-	#define RAD_LOGIN			1
-	#define RAD_FRAMED			2
-	#define RAD_CALLBACK_LOGIN		3
-	#define RAD_CALLBACK_FRAMED		4
-	#define RAD_OUTBOUND			5
-	#define RAD_ADMINISTRATIVE		6
-	#define RAD_NAS_PROMPT			7
-	#define RAD_AUTHENTICATE_ONLY		8
-	#define RAD_CALLBACK_NAS_PROMPT		9
-#define RAD_FRAMED_PROTOCOL		7	/* Integer */
-	#define RAD_PPP				1
-	#define RAD_SLIP			2
-	#define RAD_ARAP			3	/* Appletalk */
-	#define RAD_GANDALF			4
-	#define RAD_XYLOGICS			5
-#define RAD_FRAMED_IP_ADDRESS		8	/* IP address */
-#define RAD_FRAMED_IP_NETMASK		9	/* IP address */
-#define RAD_FRAMED_ROUTING		10	/* Integer */
-#define RAD_FILTER_ID			11	/* String */
-#define RAD_FRAMED_MTU			12	/* Integer */
-#define RAD_FRAMED_COMPRESSION		13	/* Integer */
-	#define RAD_COMP_NONE			0
-	#define RAD_COMP_VJ			1
-	#define RAD_COMP_IPXHDR			2
-#define RAD_LOGIN_IP_HOST		14	/* IP address */
-#define RAD_LOGIN_SERVICE		15	/* Integer */
-#define RAD_LOGIN_TCP_PORT		16	/* Integer */
-	/* unassiged			17 */
-#define RAD_REPLY_MESSAGE		18	/* String */
-#define RAD_CALLBACK_NUMBER		19	/* String */
-#define RAD_CALLBACK_ID			20	/* String */
-	/* unassiged			21 */
-#define RAD_FRAMED_ROUTE		22	/* String */
-#define RAD_FRAMED_IPX_NETWORK		23	/* IP address */
-#define RAD_STATE			24	/* String */
-#define RAD_CLASS			25	/* Integer */
-#define RAD_VENDOR_SPECIFIC		26	/* Integer */
-#define RAD_SESSION_TIMEOUT		27	/* Integer */
-#define RAD_IDLE_TIMEOUT		28	/* Integer */
-#define RAD_TERMINATION_ACTION		29	/* Integer */
-#define RAD_CALLED_STATION_ID		30	/* String */
-#define RAD_CALLING_STATION_ID		31	/* String */
-#define RAD_NAS_IDENTIFIER		32	/* Integer */
-#define RAD_PROXY_STATE			33	/* Integer */
-#define RAD_LOGIN_LAT_SERVICE		34	/* Integer */
-#define RAD_LOGIN_LAT_NODE		35	/* Integer */
-#define RAD_LOGIN_LAT_GROUP		36	/* Integer */
-#define RAD_FRAMED_APPLETALK_LINK	37	/* Integer */
-#define RAD_FRAMED_APPLETALK_NETWORK	38	/* Integer */
-#define RAD_FRAMED_APPLETALK_ZONE	39	/* Integer */
-	/* reserved for accounting		40-59 */
-#define RAD_CHAP_CHALLENGE		60	/* String */
-#define RAD_NAS_PORT_TYPE		61	/* Integer */
-	#define RAD_ASYNC			0
-	#define RAD_SYNC			1
-	#define RAD_ISDN_SYNC			2
-	#define RAD_ISDN_ASYNC_V120		3
-	#define RAD_ISDN_ASYNC_V110		4
-	#define RAD_VIRTUAL			5
-	#define RAD_PIAFS			6
-	#define RAD_HDLC_CLEAR_CHANNEL		7
-	#define RAD_X_25			8
-	#define RAD_X_75			9
-	#define RAD_G_3_FAX			10
-	#define RAD_SDSL			11
-	#define RAD_ADSL_CAP			12
-	#define RAD_ADSL_DMT			13
-	#define RAD_IDSL			14
-	#define RAD_ETHERNET			15
-	#define RAD_XDSL			16
-	#define RAD_CABLE			17
-	#define RAD_WIRELESS_OTHER		18
-	#define RAD_WIRELESS_IEEE_802_11	19
-#define RAD_PORT_LIMIT			62	/* Integer */
-#define RAD_LOGIN_LAT_PORT		63	/* Integer */
-#define RAD_CONNECT_INFO		77	/* String */
-
-#define RAD_NAS_IPV6_ADDRESS		95      /* IPv6 address */
-#define RAD_FRAMED_INTERFACE_ID		96      /* 8 octets */
-#define RAD_FRAMED_IPV6_PREFIX		97      /* Octets */
-#define RAD_LOGIN_IPV6_HOST		98      /* IPv6 address */
-#define RAD_FRAMED_IPV6_ROUTE		99      /* String */
-#define RAD_FRAMED_IPV6_POOL		100     /* String */
-
-/* Accounting attribute types and values */
-#define RAD_ACCT_STATUS_TYPE		40	/* Integer */
-	#define RAD_START			1
-	#define RAD_STOP			2
-	#define RAD_ACCOUNTING_ON		7
-	#define RAD_ACCOUNTING_OFF		8
-#define RAD_ACCT_DELAY_TIME		41	/* Integer */
-#define RAD_ACCT_INPUT_OCTETS		42	/* Integer */
-#define RAD_ACCT_OUTPUT_OCTETS		43	/* Integer */
-#define RAD_ACCT_SESSION_ID		44	/* String */
-#define RAD_ACCT_AUTHENTIC		45	/* Integer */
-	#define RAD_AUTH_RADIUS			1
-	#define RAD_AUTH_LOCAL			2
-	#define RAD_AUTH_REMOTE			3
-#define RAD_ACCT_SESSION_TIME		46	/* Integer */
-#define RAD_ACCT_INPUT_PACKETS		47	/* Integer */
-#define RAD_ACCT_OUTPUT_PACKETS		48	/* Integer */
-#define RAD_ACCT_TERMINATE_CAUSE	49	/* Integer */
-	#define RAD_TERM_USER_REQUEST		1
-	#define RAD_TERM_LOST_CARRIER		2
-	#define RAD_TERM_LOST_SERVICE		3
-	#define RAD_TERM_IDLE_TIMEOUT		4
-	#define RAD_TERM_SESSION_TIMEOUT	5
-	#define RAD_TERM_ADMIN_RESET		6
-	#define RAD_TERM_ADMIN_REBOOT		7
-	#define RAD_TERM_PORT_ERROR		8
-	#define RAD_TERM_NAS_ERROR		9
-	#define RAD_TERM_NAS_REQUEST		10
-	#define RAD_TERM_NAS_REBOOT		11
-	#define RAD_TERM_PORT_UNNEEDED		12
-	#define RAD_TERM_PORT_PREEMPTED		13
-	#define RAD_TERM_PORT_SUSPENDED		14
-	#define RAD_TERM_SERVICE_UNAVAILABLE    15
-	#define RAD_TERM_CALLBACK		16
-	#define RAD_TERM_USER_ERROR		17
-	#define RAD_TERM_HOST_REQUEST		18
-#define	RAD_ACCT_MULTI_SESSION_ID	50	/* String */
-#define	RAD_ACCT_LINK_COUNT		51	/* Integer */
-
-struct rad_handle;
-struct timeval;
-
-struct rad_handle	*rad_acct_open(void);
-int			 rad_add_server(struct rad_handle *, 
-				const char *, int, const char *, int, int);
-struct rad_handle	*rad_auth_open(void);
-void			 rad_close(struct rad_handle *);
-int			 rad_config(struct rad_handle *, const char *);
-int			 rad_continue_send_request(struct rad_handle *, 
-				int, int *, struct timeval *);
-int			 rad_create_request(struct rad_handle *, int);
-struct in_addr		 rad_cvt_addr(const void *);
-u_int32_t		 rad_cvt_int(const void *);
-char			*rad_cvt_string(const void *, size_t);
-int			 rad_get_attr(struct rad_handle *, const void **, size_t *);
-int			 rad_init_send_request(struct rad_handle *, int *, struct timeval *);
-struct rad_handle	*rad_open(void);  /* Deprecated, == rad_auth_open */
-int			 rad_put_addr(struct rad_handle *, int, struct in_addr);
-int			 rad_put_attr(struct rad_handle *, int, const void *, size_t);
-int			 rad_put_int(struct rad_handle *, int, u_int32_t);
-int			 rad_put_string(struct rad_handle *, int, const char *);
-ssize_t			 rad_request_authenticator(struct rad_handle *, char *, size_t);
-int			 rad_send_request(struct rad_handle *);
-const char		*rad_server_secret(struct rad_handle *);
-const char		*rad_strerror(struct rad_handle *);
-int			 rad_demangle(struct rad_handle *, const void *, size_t, u_char *);
-
-#endif /* _RADLIB_H_ */
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib_md5.h php-radius-1.4.0~b1/radius-1.2.7/radlib_md5.h
--- php-radius-1.2.7/radius-1.2.7/radlib_md5.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib_md5.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution.
-3. The names of the authors may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This code cannot simply be copied and put under the GNU Public License or 
-any other GPL-like (LGPL, GPL2) License.
-
-    $Id$
-*/
-
-#include "php.h"
-#include "ext/standard/md5.h"
-
-#define MD5Init PHP_MD5Init
-#define MD5Update PHP_MD5Update
-#define MD5Final PHP_MD5Final
-#define MD5_CTX PHP_MD5_CTX
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib_private.h php-radius-1.4.0~b1/radius-1.2.7/radlib_private.h
--- php-radius-1.2.7/radius-1.2.7/radlib_private.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/*-
- * Copyright 1998 Juniper Networks, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$FreeBSD: src/lib/libradius/radlib_private.h,v 1.4.2.1 2002/06/17 02:24:57 brian Exp $
- */
-
-#ifndef RADLIB_PRIVATE_H
-#define RADLIB_PRIVATE_H
-
-#include <sys/types.h>
-
-#ifndef PHP_WIN32
-#include <netinet/in.h>
-#endif
-
-#include "radlib_compat.h"
-#include "radlib.h"
-#include "radlib_vs.h"
-
-/* Handle types */
-#define RADIUS_AUTH		0   /* RADIUS authentication, default */
-#define RADIUS_ACCT		1   /* RADIUS accounting */
-
-/* Defaults */
-#define MAXTRIES		3
-#define PATH_RADIUS_CONF	"/etc/radius.conf"
-#define RADIUS_PORT		1812
-#define RADACCT_PORT		1813
-#define TIMEOUT			3	/* In seconds */
-
-/* Limits */
-#define ERRSIZE		128		/* Maximum error message length */
-#define MAXCONFLINE	1024		/* Maximum config file line length */
-#define MAXSERVERS	10		/* Maximum number of servers to try */
-#define MSGSIZE		4096		/* Maximum RADIUS message */
-#define PASSSIZE	128		/* Maximum significant password chars */
-
-/* Positions of fields in RADIUS messages */
-#define POS_CODE	0		/* Message code */
-#define POS_IDENT	1		/* Identifier */
-#define POS_LENGTH	2		/* Message length */
-#define POS_AUTH	4		/* Authenticator */
-#define LEN_AUTH	16		/* Length of authenticator */
-#define POS_ATTRS	20		/* Start of attributes */
-
-struct rad_server {
-	struct sockaddr_in addr;	/* Address of server */
-	char		*secret;	/* Shared secret */
-	int		 timeout;	/* Timeout in seconds */
-	int		 max_tries;	/* Number of tries before giving up */
-	int		 num_tries;	/* Number of tries so far */
-};
-
-struct rad_handle {
-	int		 fd;		/* Socket file descriptor */
-	struct rad_server servers[MAXSERVERS];	/* Servers to contact */
-	int		 num_servers;	/* Number of valid server entries */
-	int		 ident;		/* Current identifier value */
-	char		 errmsg[ERRSIZE];	/* Most recent error message */
-	unsigned char	 request[MSGSIZE];	/* Request to send */
-	char	 	 request_created;	/* rad_create_request() called? */        
-	int		 req_len;	/* Length of request */
-	char		 pass[PASSSIZE];	/* Cleartext password */
-	int		 pass_len;	/* Length of cleartext password */
-	int		 pass_pos;	/* Position of scrambled password */
-	char	 	 chap_pass;	/* Have we got a CHAP_PASSWORD ? */
-	unsigned char	 response[MSGSIZE];	/* Response received */
-	int		 resp_len;	/* Length of response */
-	int		 resp_pos;	/* Current position scanning attrs */
-	int		 total_tries;	/* How many requests we'll send */
-	int		 try;		/* How many requests we've sent */
-	int		 srv;		/* Server number we did last */
-	int		 type;		/* Handle type */
-};
-
-struct vendor_attribute {
-	u_int32_t vendor_value;
-	u_char attrib_type;
-	u_char attrib_len;
-	u_char attrib_data[1];
-};
-
-#endif
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/radlib_vs.h php-radius-1.4.0~b1/radius-1.2.7/radlib_vs.h
--- php-radius-1.2.7/radius-1.2.7/radlib_vs.h	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/radlib_vs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Brian Somers <brian@Awfulhak.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libradius/radlib_vs.h,v 1.2.2.1 2002/06/17 02:24:57 brian Exp $
- */
-
-#ifndef _RADLIB_VS_H_
-#define _RADLIB_VS_H_
-
-#include <sys/types.h>
-#ifndef PHP_WIN32
-#include <netinet/in.h>
-#endif
-
-#include "radlib_compat.h"
-
-#define	RAD_VENDOR_MICROSOFT	311		/* rfc2548 */
-	#define	RAD_MICROSOFT_MS_CHAP_RESPONSE			1
-	#define	RAD_MICROSOFT_MS_CHAP_ERROR			2
-	#define	RAD_MICROSOFT_MS_CHAP_PW_1			3
-	#define	RAD_MICROSOFT_MS_CHAP_PW_2			4
-	#define	RAD_MICROSOFT_MS_CHAP_LM_ENC_PW			5
-	#define	RAD_MICROSOFT_MS_CHAP_NT_ENC_PW			6
-	#define	RAD_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY		7
-	#define	RAD_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES		8
-	#define	RAD_MICROSOFT_MS_RAS_VENDOR			9
-	#define	RAD_MICROSOFT_MS_CHAP_DOMAIN			10
-	#define	RAD_MICROSOFT_MS_CHAP_CHALLENGE			11
-	#define	RAD_MICROSOFT_MS_CHAP_MPPE_KEYS			12
-	#define	RAD_MICROSOFT_MS_BAP_USAGE			13
-	#define	RAD_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD	14
-	#define	RAD_MICROSOFT_MS_LINK_DROP_TIME_LIMIT		15
-	#define	RAD_MICROSOFT_MS_MPPE_SEND_KEY			16
-	#define	RAD_MICROSOFT_MS_MPPE_RECV_KEY			17
-	#define	RAD_MICROSOFT_MS_RAS_VERSION			18
-	#define	RAD_MICROSOFT_MS_OLD_ARAP_PASSWORD		19
-	#define	RAD_MICROSOFT_MS_NEW_ARAP_PASSWORD		20
-	#define	RAD_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON	21
-	#define	RAD_MICROSOFT_MS_FILTER				22
-	#define	RAD_MICROSOFT_MS_ACCT_AUTH_TYPE			23
-	#define	RAD_MICROSOFT_MS_ACCT_EAP_TYPE			24
-	#define	RAD_MICROSOFT_MS_CHAP2_RESPONSE			25
-	#define	RAD_MICROSOFT_MS_CHAP2_SUCCESS			26
-	#define	RAD_MICROSOFT_MS_CHAP2_PW			27
-	#define	RAD_MICROSOFT_MS_PRIMARY_DNS_SERVER		28
-	#define	RAD_MICROSOFT_MS_SECONDARY_DNS_SERVER		29
-	#define	RAD_MICROSOFT_MS_PRIMARY_NBNS_SERVER		30
-	#define	RAD_MICROSOFT_MS_SECONDARY_NBNS_SERVER		31
-	#define	RAD_MICROSOFT_MS_ARAP_CHALLENGE			33
-
-#define SALT_LEN    2
-
-struct rad_handle;
-
-int	rad_get_vendor_attr(u_int32_t *, unsigned char *, const void **, size_t *, const void *, size_t);
-int	rad_put_vendor_addr(struct rad_handle *, int, int, struct in_addr);
-int	rad_put_vendor_attr(struct rad_handle *, int, int, const void *,
-	    size_t);
-int	rad_put_vendor_int(struct rad_handle *, int, int, u_int32_t);
-int	rad_put_vendor_string(struct rad_handle *, int, int, const char *);
-int	rad_demangle_mppe_key(struct rad_handle *, const void *, size_t, u_char *, size_t *);
-
-#endif /* _RADLIB_VS_H_ */
-
-/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_acct_open.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_acct_open.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_acct_open.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_acct_open.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---TEST--
-radius_acct_open()
---INI--
-display_errors=1
-error_reporting=-1
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-$res = radius_acct_open();
-var_dump($res);
-?>
---EXPECTF--
-resource(%d) of type (rad_handle)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_auth_open.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_auth_open.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_auth_open.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_auth_open.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---TEST--
-radius_auth_open()
---INI--
-display_errors=1
-error_reporting=-1
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-$res = radius_auth_open();
-var_dump($res);
-?>
---EXPECTF--
-resource(%d) of type (rad_handle)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_close.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_close.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_close.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_close.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
---TEST--
-radius_close()
---INI--
-display_errors=1
-error_reporting=-1
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-var_dump(radius_close(radius_acct_open()));
-var_dump(radius_close(radius_auth_open()));
-
-// The boolean cast is because PHP 4 will return NULL rather than false here.
-var_dump((boolean) radius_close(opendir('.')));
-?>
---EXPECTF--
-bool(true)
-bool(true)
-
-Warning: radius_close(): supplied resource is not a valid rad_handle resource in %s on line %d
-bool(false)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_cvt_addr.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_cvt_addr.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_cvt_addr.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_cvt_addr.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---TEST--
-radius_cvt_addr()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-var_dump(radius_cvt_addr(pack('N', ip2long('127.0.0.1'))));
-?>
---EXPECT--
-string(9) "127.0.0.1"
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_cvt_int.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_cvt_int.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_cvt_int.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_cvt_int.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---TEST--
-radius_cvt_int()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-var_dump(radius_cvt_int(pack('N', 1234)));
-?>
---EXPECT--
-int(1234)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_cvt_string.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_cvt_string.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_cvt_string.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_cvt_string.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---TEST--
-radius_cvt_string()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-var_dump(radius_cvt_string('127.0.0.1'));
-?>
---EXPECT--
-string(9) "127.0.0.1"
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_get_attr.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_get_attr.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_get_attr.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_get_attr.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
---TEST--
-radius_get_attr()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-if (FakeServer::skip()) {
-    die('SKIP: pcntl, radius and sockets extensions required');
-}
-?>
---FILE--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-$server = new FakeServer;
-$res = $server->getAuthResource();
-
-$request = Request::expect(RADIUS_ACCESS_REQUEST, array(
-    Attribute::expect(RADIUS_USER_NAME, 'foo'),
-));
-
-$response = new RadiusResponse;
-$response->code = RADIUS_ACCESS_REJECT;
-$response->attributes = array(
-    Attribute::expect(RADIUS_REPLY_MESSAGE, 'Go away'),
-);
-
-$server->addTransaction($request, $response);
-$server->handle();
-
-radius_create_request($res, RADIUS_ACCESS_REQUEST);
-radius_put_string($res, RADIUS_USER_NAME, 'foo');
-radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
-
-var_dump(radius_get_attr($res));
-
-radius_send_request($res);
-
-var_dump(radius_get_attr($res));
-
-var_dump($server->wait());
-?>
---EXPECTF--
-bool(false)
-array(2) {
-  ["attr"]=>
-  int(18)
-  ["data"]=>
-  string(7) "Go away"
-}
-int(0)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_get_vendor_attr.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_get_vendor_attr.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_get_vendor_attr.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_get_vendor_attr.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
---TEST--
-radius_get_vendor_attr()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-var_dump(radius_get_vendor_attr(''));
-
-// Test with an incorrect length.
-$data = 'foo';
-var_dump(radius_get_vendor_attr(pack('NCC', RADIUS_VENDOR_MICROSOFT, 1, strlen($data) + 3).$data));
-
-$data = 'foo';
-var_dump(radius_get_vendor_attr(pack('NCC', RADIUS_VENDOR_MICROSOFT, 1, strlen($data) + 2).$data));
-?>
---EXPECT--
-bool(false)
-bool(false)
-array(3) {
-  ["attr"]=>
-  int(1)
-  ["vendor"]=>
-  int(311)
-  ["data"]=>
-  string(3) "foo"
-}
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_put_addr.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_addr.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_put_addr.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_addr.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
---TEST--
-radius_put_addr()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-if (FakeServer::skip()) {
-    die('SKIP: pcntl, radius and sockets extensions required');
-}
-?>
---FILE--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-$server = new FakeServer;
-$res = $server->getAuthResource();
-
-$request = Request::expect(RADIUS_ACCESS_REQUEST, array(
-    Attribute::expect(RADIUS_USER_NAME, 'foo'),
-    Attribute::expect(RADIUS_NAS_IP_ADDRESS, pack('N', ip2long('127.0.0.1'))),
-));
-
-$response = new RadiusResponse;
-$response->code = RADIUS_ACCESS_REJECT;
-$response->attributes = array(
-    Attribute::expect(RADIUS_REPLY_MESSAGE, 'Go away'),
-);
-
-$server->addTransaction($request, $response);
-$server->handle();
-
-var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1'));
-
-radius_create_request($res, RADIUS_ACCESS_REQUEST);
-radius_put_string($res, RADIUS_USER_NAME, 'foo');
-radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
-var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1'));
-radius_send_request($res);
-
-var_dump($server->wait());
-?>
---EXPECTF--
-bool(false)
-bool(true)
-int(0)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_put_attr.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_attr.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_put_attr.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_attr.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
---TEST--
-radius_put_attr()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-if (FakeServer::skip()) {
-    die('SKIP: pcntl, radius and sockets extensions required');
-}
-?>
---FILE--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-$server = new FakeServer;
-$res = $server->getAuthResource();
-
-$request = Request::expect(RADIUS_ACCESS_REQUEST, array(
-    Attribute::expect(RADIUS_USER_NAME, 'foo'),
-));
-
-$response = new RadiusResponse;
-$response->code = RADIUS_ACCESS_REJECT;
-$response->attributes = array(
-    Attribute::expect(RADIUS_REPLY_MESSAGE, 'Go away'),
-);
-
-$server->addTransaction($request, $response);
-$server->handle();
-
-var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo'));
-
-radius_create_request($res, RADIUS_ACCESS_REQUEST);
-var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo'));
-radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
-radius_send_request($res);
-
-var_dump($server->wait());
-?>
---EXPECTF--
-bool(false)
-bool(true)
-int(0)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_put_int.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_int.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_put_int.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_int.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
---TEST--
-radius_put_int()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-if (FakeServer::skip()) {
-    die('SKIP: pcntl, radius and sockets extensions required');
-}
-?>
---FILE--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-$server = new FakeServer;
-$res = $server->getAuthResource();
-
-$request = Request::expect(RADIUS_ACCESS_REQUEST, array(
-    Attribute::expect(RADIUS_USER_NAME, 'foo'),
-    Attribute::expect(RADIUS_NAS_PORT, pack('N', 1234)),
-));
-
-$response = new RadiusResponse;
-$response->code = RADIUS_ACCESS_REJECT;
-$response->attributes = array(
-    Attribute::expect(RADIUS_REPLY_MESSAGE, 'Go away'),
-);
-
-$server->addTransaction($request, $response);
-$server->handle();
-
-var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234));
-
-radius_create_request($res, RADIUS_ACCESS_REQUEST);
-radius_put_string($res, RADIUS_USER_NAME, 'foo');
-radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
-var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234));
-radius_send_request($res);
-
-var_dump($server->wait());
-?>
---EXPECTF--
-bool(false)
-bool(true)
-int(0)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_put_string.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_string.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_put_string.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_put_string.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
---TEST--
-radius_put_string()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-if (FakeServer::skip()) {
-    die('SKIP: pcntl, radius and sockets extensions required');
-}
-?>
---FILE--
-<?php
-include dirname(__FILE__).'/server/fake_server.php';
-
-$server = new FakeServer;
-$res = $server->getAuthResource();
-
-$request = Request::expect(RADIUS_ACCESS_REQUEST, array(
-    Attribute::expect(RADIUS_USER_NAME, 'foo'),
-));
-
-$response = new RadiusResponse;
-$response->code = RADIUS_ACCESS_REJECT;
-$response->attributes = array(
-    Attribute::expect(RADIUS_REPLY_MESSAGE, 'Go away'),
-);
-
-$server->addTransaction($request, $response);
-$server->handle();
-
-var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo'));
-
-radius_create_request($res, RADIUS_ACCESS_REQUEST);
-var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo'));
-radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
-radius_send_request($res);
-
-var_dump($server->wait());
-?>
---EXPECTF--
-bool(false)
-bool(true)
-int(0)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_request_authenticator.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_request_authenticator.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_request_authenticator.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_request_authenticator.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---TEST--
-radius_request_authenticator()
---INI--
-display_errors=1
-error_reporting=30719
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-$res = radius_acct_open();
-var_dump(radius_request_authenticator($res));
-?>
---EXPECTF--
-string(16) "%s"
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_server_secret_config.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_server_secret_config.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_server_secret_config.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_server_secret_config.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
---TEST--
-radius_server_secret(): load from configuration file
---INI--
-display_errors=1
-error_reporting=-1
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-$file = dirname(__FILE__).'/radius_server_secret.conf';
-$fp = fopen($file, 'w');
-fwrite($fp, 'acct localhost "a shared secret"'."\n");
-fclose($fp);
-
-$res = radius_acct_open();
-radius_config($res, $file);
-var_dump(radius_server_secret($res));
-radius_close($res);
-
-$file = dirname(__FILE__).'/radius_server_secret.conf';
-$fp = fopen($file, 'w');
-fwrite($fp, 'acct what.is.hopefully.a.nonexistent.domain "a shared secret"');
-fclose($fp);
-
-// This shouldn't create a server, but crashed before 8f1de6f.
-$res = radius_acct_open();
-radius_config($res, $file);
-var_dump(radius_server_secret($res));
-radius_close($res);
-?>
---CLEAN--
-<?php
-$file = dirname(__FILE__).'/radius_server_secret.conf';
-@unlink($file);
-?>
---EXPECTF--
-string(15) "a shared secret"
-bool(false)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/radius_server_secret.phpt php-radius-1.4.0~b1/radius-1.2.7/tests/radius_server_secret.phpt
--- php-radius-1.2.7/radius-1.2.7/tests/radius_server_secret.phpt	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/radius_server_secret.phpt	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
---TEST--
-radius_server_secret(): load from radius_add_server()
---INI--
-display_errors=1
-error_reporting=-1
---SKIPIF--
-<?php
-if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
-?>
---FILE--
-<?php
-$res = radius_acct_open();
-radius_add_server($res, 'localhost', 1234, 'a shared secret', 5, 3);
-var_dump(radius_server_secret($res));
-radius_close($res);
-
-// This shouldn't create a server, but crashed before 8f1de6f.
-$res = radius_acct_open();
-radius_add_server($res, 'what.is.hopefully.a.nonexistent.domain', 1234, 'a shared secret', 5, 3);
-var_dump(radius_server_secret($res));
-var_dump(radius_strerror($res));
-radius_close($res);
-
-$res = radius_acct_open();
-var_dump(radius_server_secret($res));
-radius_close($res);
-?>
---EXPECTF--
-string(15) "a shared secret"
-bool(false)
-string(27) "No RADIUS servers specified"
-bool(false)
diff -Nru php-radius-1.2.7/radius-1.2.7/tests/server/fake_server.php php-radius-1.4.0~b1/radius-1.2.7/tests/server/fake_server.php
--- php-radius-1.2.7/radius-1.2.7/tests/server/fake_server.php	2013-06-27 21:14:24.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.2.7/tests/server/fake_server.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,420 +0,0 @@
-<?php
-
-/**
- * A basic set of classes that allow a RADIUS server to be mocked.
- *
- * Note that the code here is intentionally coded to allow PHP 4 usage. The
- * minimum requirement should be PHP 4.1.0, due to the use of pcntl_fork().
- *
- * @author Adam Harvey <aharvey@php.net>
- */
-
-/** An attribute in a RADIUS request or response. */
-class Attribute {
-    /**
-     * The attribute type.
-     *
-     * @var integer $type
-     */
-    var $type;
-
-    /**
-     * The attribute value.
-     *
-     * @var string $value
-     */
-    var $value;
-
-    /**
-     * Compares two attributes for equality.
-     *
-     * @static
-     * @param Attribute $expected
-     * @param Attribute $actual
-     * @return boolean
-     */
-    function compare($expected, $actual) {
-        return ($expected == $actual);
-    }
-
-    /**
-     * Creates an attribute with the given type and value.
-     *
-     * @static
-     * @param integer $type
-     * @param string  $value
-     * @return Attribute
-     */
-    function expect($type, $value) {
-        $attribute = new Attribute;
-
-        $attribute->type = $type;
-        $attribute->value = $value;
-
-        return $attribute;
-    }
-
-    /**
-     * Parses the given attribute from a RADIUS packet.
-     *
-     * The error checking here is minimal, to say the least. We don't even
-     * check the size field is valid.
-     *
-     * @static
-     * @param string $raw
-     * @return Attribute
-     */
-    function parse($raw) {
-        $attribute = new Attribute;
-        $data = unpack('Ctype/Csize', $raw);
-
-        $attribute->type = $data['type'];
-        $attribute->value = substr($raw, 2, $data['size'] - 2);
-
-        return $attribute;
-    }
-
-    /**
-     * Serialises the attribute into the RADIUS wire structure.
-     *
-     * @return string
-     */
-    function serialise() {
-        return pack('CC', $this->type, strlen($this->value) + 2).$this->value;
-    }
-}
-
-/** A RADIUS request. */
-class Request {
-    /**
-     * The request attributes.
-     *
-     * @var Attribute[] $attributes
-     */
-    var $attributes = array();
-
-    /**
-     * The authenticator field from the packet.
-     *
-     * @var string $authenticator
-     */
-    var $authenticator;
-
-    /**
-     * The request code.
-     *
-     * @var integer $code
-     */
-    var $code;
-
-    /**
-     * The request identifier.
-     *
-     * @var integer $id
-     */
-    var $id;
-
-    /**
-     * The raw request data.
-     *
-     * @var string $raw
-     */
-    var $raw;
-
-    /**
-     * Compares an actual request to its expected values.
-     *
-     * If the comparison fails, the error message is printed.
-     *
-     * @static
-     * @param Request $expected
-     * @param Request $actual
-     * @return boolean
-     */
-    function compare($expected, $actual) {
-        if ($expected->code != $actual->code) {
-            printf("Expected code %d does not match actual code %d\n", $expected->code, $actual->code);
-            return false;
-        }
-
-        foreach ($expected->attributes as $attribute) {
-            $found = false;
-
-            foreach ($actual->attributes as $actual_attr) {
-                if (Attribute::compare($attribute, $actual_attr)) {
-                    $found = true;
-                    break;
-                }
-            }
-
-            if (!$found) {
-                printf("Expected attribute %d with value '%s' not found in attribute set\n", $attribute->type, $attribute->value);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a new Request with the given code and attributes.
-     *
-     * @static
-     * @param integer     $code
-     * @param Attribute[] $attributes
-     * @return Request
-     */
-    function expect($code, $attributes = array()) {
-        $request = new Request;
-
-        $request->code = $code;
-        $request->attributes = $attributes;
-
-        return $request;
-    }
-
-    /**
-     * Parses a RADIUS request packet.
-     *
-     * @static
-     * @param string $raw
-     * @return Request
-     */
-    function parse($raw) {
-        $request = new Request;
-        $data = unpack('Ccode/Cid/nsize', $raw);
-
-        $request->raw = $raw;
-        $request->code = $data['code'];
-        $request->id = $data['id'];
-        $request->authenticator = substr($raw, 4, 16);
-        $attributes = substr($raw, 20);
-
-        while (strlen($attributes)) {
-            $attribute = Attribute::parse($attributes);
-            $attributes = substr($attributes, strlen($attribute->value) + 2);
-            $request->attributes[] = $attribute;
-        }
-
-        return $request;
-    }
-}
-
-/** A basic RADIUS response containing arbitrary data. */
-class Response {
-    /**
-     * The data to send.
-     *
-     * @var string $data
-     */
-    var $data;
-
-    /**
-     * Serialises the data (which in this case means do nothing).
-     *
-     * @param Request $request The request being responded to.
-     * @param string  $secret  The shared secret.
-     * @return string The RADIUS response packet.
-     */
-    function serialise($request, $secret) {
-        return $this->data;
-    }
-}
-
-/** A higher level RADIUS response packet that handles encoding and packing. */
-class RadiusResponse extends Response {
-    /**
-     * The attributes to include.
-     *
-     * @var Attribute[] $attributes
-     */
-    var $attributes;
-
-    /**
-     * The response code.
-     *
-     * @var integer $code
-     */
-    var $code;
-
-    /**
-     * Serialises the data into a RADIUS response packet.
-     *
-     * @param Request $request The request being responded to.
-     * @param string  $secret  The shared secret.
-     * @return string The RADIUS response packet.
-     */
-    function serialise($request, $secret) {
-        $attributes = '';
-        foreach ($this->attributes as $attribute) {
-            $attributes .= $attribute->serialise();
-        }
-
-        $header = pack('CCn', $this->code, $request->id, 20 + strlen($attributes));
-        $auth = md5($header.$request->authenticator.$attributes.$secret);
-        $auth = pack('H*', $auth);
-        return $header.$auth.$attributes;
-    }
-}
-
-/** The fake RADIUS server. */
-class FakeServer {
-    /**
-     * The address to listen at.
-     *
-     * @var string $address
-     */
-    var $address = '127.0.0.1';
-
-    /**
-     * The port to listen on.
-     *
-     * @var integer $port
-     */
-    var $port = 63563;
-
-    /**
-     * The RADIUS shared secret.
-     *
-     * @var string $secret
-     */
-    var $secret = 'This is a shared secret';
-
-    /**
-     * The expected transactions that will occur once the server starts
-     * handing requests.
-     *
-     * @access private
-     * @var array[] $transactions
-     */
-    var $transactions = array();
-
-    /**
-     * Adds an expected transaction.
-     *
-     * @param Request  $request  The request to expect.
-     * @param Response $response The response to issue in response to the
-     *                           request. If omitted or NULL, no response will
-     *                           be sent.
-     * @return void
-     */
-    function addTransaction($expectedRequest, $response = null) {
-        $this->transactions[] = array(
-            'request'  => $expectedRequest,
-            'response' => $response,
-        );
-    }
-
-    /**
-     * Convenience method to create an accounting client resource for this
-     * server.
-     *
-     * @return resource
-     */
-    function getAcctResource() {
-        $res = radius_acct_open();
-        radius_add_server($res, $this->address, $this->port, $this->secret, 5, 1);
-
-        return $res;
-    }
-
-    /**
-     * Convenience method to create an authentication client resource for this
-     * server.
-     *
-     * @return resource
-     */
-    function getAuthResource() {
-        $res = radius_auth_open();
-        radius_add_server($res, $this->address, $this->port, $this->secret, 5, 1);
-
-        return $res;
-    }
-
-    /**
-     * Forks the server and handles requests.
-     *
-     * @return integer The child PID.
-     */
-    function handle() {
-        // Hook up the signal handler for the child's signal that it's ready.
-        pcntl_signal(SIGUSR1, array($this, 'signal'));
-
-        $pid = pcntl_fork();
-
-        if ($pid == 0) {
-            $success = true;
-            $socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-            socket_bind($socket, $this->address, $this->port);
-
-            // Tell the parent we're good to go.
-            posix_kill(posix_getppid(), SIGUSR1);
-
-            while (count($this->transactions)) {
-                $buffer = null;
-                $from = null;
-                $port = null;
-
-                socket_recvfrom($socket, $buffer, 4096, 0, $from, $port);
-                $request = Request::parse($buffer);
-                $transaction = array_shift($this->transactions);
-
-                if (Request::compare($transaction['request'], $request)) {
-                    if (!is_null($transaction['response'])) {
-                        $response = $transaction['response']->serialise($request, $this->secret);
-                        socket_sendto($socket, $response, strlen($response), 0, $from, $port);
-                    }
-                } else {
-                    echo "ERROR: Request did not match\n";
-                    $success = false;
-                    break;
-                }
-            }
-
-            socket_close($socket);
-            exit(!$success);
-        } else {
-            // Wait for SIGUSR1 from the child process to indicate it's
-            // started up. If it takes more than 10 seconds, there are bigger
-            // problems.
-            if (sleep(10) || version_compare(phpversion(), '5.0.0', '<')) {
-                // OK, the child is ready.
-                return $pid;
-            } else {
-                echo "ERROR: Fake RADIUS server never signalled it was ready\n";
-                posix_kill($pid, SIGINT);
-
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Tests if a test involving the fake server should be skipped due to PHP
-     * lacking support for a required feature.
-     *
-     * @return boolean
-     */
-    function skip() {
-        return !(function_exists('socket_create') && function_exists('pcntl_fork') && function_exists('radius_acct_open'));
-    }
-
-    /**
-     * The signal handler which does nothing, successfully.
-     *
-     * @param integer $signo
-     * @return void
-     */
-    function signal($signo) {
-    }
-
-    /**
-     * Waits for the child process to finish running and returns the exit code.
-     *
-     * @return integer
-     */
-    function wait() {
-        pcntl_waitpid(-1, $status);
-        return $status;
-    }
-}
diff -Nru php-radius-1.2.7/radius-1.4.0b1/config.m4 php-radius-1.4.0~b1/radius-1.4.0b1/config.m4
--- php-radius-1.2.7/radius-1.4.0b1/config.m4	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/config.m4	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,20 @@
+dnl $Id$
+dnl config.m4 for extension radius
+
+PHP_ARG_ENABLE(radius, whether to enable radius support,
+dnl Make sure that the comment is aligned:
+[  --enable-radius           Enable radius support])
+
+if test "$PHP_RADIUS" != "no"; then
+
+  AC_TRY_COMPILE([
+#include <sys/types.h>
+  ], [
+u_int32_t ulongint;
+ulongint = 1;
+  ], [
+    AC_DEFINE(HAVE_U_INT32_T, 1, [ ])
+  ])
+
+ PHP_NEW_EXTENSION(radius, radius.c radlib.c, $ext_shared)
+fi
diff -Nru php-radius-1.2.7/radius-1.4.0b1/config.w32 php-radius-1.4.0~b1/radius-1.4.0b1/config.w32
--- php-radius-1.2.7/radius-1.4.0b1/config.w32	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/config.w32	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,9 @@
+// $Id$
+// vim:ft=javascript
+
+ARG_WITH("radius", "Radius Support", "no");
+
+if (PHP_RADIUS == "yes") {
+	EXTENSION("radius", "radius.c radlib.c radlib_compat.c");
+	AC_DEFINE('HAVE_RADIUS', 1, 'Have Radius support', false);
+}
diff -Nru php-radius-1.2.7/radius-1.4.0b1/CREDITS php-radius-1.4.0~b1/radius-1.4.0b1/CREDITS
--- php-radius-1.2.7/radius-1.4.0b1/CREDITS	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/CREDITS	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,5 @@
+RADIUS
+Michael Bretterklieber, The FreeBSD Project http://www.freebsd.org
+
+RFC3576 support
+Gabriel Blanchard <gabe@teksavvy.com>
diff -Nru php-radius-1.2.7/radius-1.4.0b1/examples/des.php php-radius-1.4.0~b1/radius-1.4.0b1/examples/des.php
--- php-radius-1.2.7/radius-1.4.0b1/examples/des.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/examples/des.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,295 @@
+<?PHP
+/*The contents of this document are free for use by anyone for any purpose they choose.
+no warranty is implied, nor will one be honored.  The author assumes no liability for
+any consequences that may arise from the use of contents of this document.  Events not
+covered include but are not limited to: system crashes, system slowdown, system failure,
+fires, explosions, floods, earthquakes, boiling seas, intestinal inflammation, cold coffee,
+and total protonic inversion.
+Any questions, comments, or improvements are appreciated and can be directed to:
+
+Tim Thorpe
+blushift@netins.net
+*/
+
+/*
+This script implements the 56-bit DES encryption algorithm,
+created from scratch based on interpretation of the original
+specification document.
+
+des_encrypt_ecb("my key", "my text");
+and
+mcrypt_ecb (MCRYPT_DES, "my key", "my text", MCRYPT_ENCRYPT, str_pad("", 8, chr(0x00)));
+are functionally identical.
+
+Because PHP is lacking in bitwise operators, this set of routines
+makes use of data that has been expanded so that a byte becomes an 8-byte string.
+
+The script performs the transformations, and then condenses the data back to a usable form.
+Apologies for a lack of comments in the bulk of the functions.
+*/////////////////////////////////////////////////////////////////////////////
+
+function des_encrypt_ecb($key, $clearText) {
+//Function to implement Electronic Code Book encoding
+//I haven't had occasion to add any other methods or a decoder for that matter,
+//but all of the underlying functions were written to be universal to all encoding methods,
+//so adding other methods should be easy if you need them.
+
+    if (strlen($key) < 7)
+        $key = str_pad(substr($key, 0, 7), 7, chr(0x00));  //We need 7 bytes for a key; no more, no less
+        
+    if (strlen($key) == 7) $key = des_add_parity($key);
+	
+	$keys = des_make_subkeys (des_bits_to_bytes ($key));  //Chew the key into the subkeys needed for DES
+	$blockCount = (int) (strlen($clearText) / 8);  //Figure out how many blocks of 8 bytes we need to encode
+	if (strlen ($clearText) % 8) {  //Check to see if there are any leftovers
+		$blockCount++;  //Add another block for them
+		$clearText = str_pad($clearText, $blockCount * 8, chr(0x00));  //Pad it out with zeroes
+	}
+	for ($i = 0; $i < $blockCount; $i++) {  //Cycle through the blocks
+		$clearBlock = substr($clearText, $i * 8, 8);  //Grab a block from the input
+		$cypherBlock = des_block_encode(des_bits_to_bytes ($clearBlock), $keys);  //Encrypt it
+		$cypherText .= des_bytes_to_bits ($cypherBlock);  //Convert the result back to a useful form
+	}
+	return ($cypherText);  //Cough it up
+}
+
+function des_block_encode($clearText, $subKeys) {
+	$ip_table = array(58, 50, 42, 34, 26, 18, 10,  2,
+			  60, 52, 44, 36, 28, 20, 12,  4,
+			  62, 54, 46, 38, 30, 22, 14,  6,
+			  64, 56, 48, 40, 32, 24, 16,  8,
+			  57, 49, 41, 33, 25, 17,  9,  1,
+			  59, 51, 43, 35, 27, 19, 11,  3,
+			  61, 53, 45, 37, 29, 21, 13,  5,
+			  63, 55, 47, 39, 31, 23, 15,  7);
+
+	$ip1_table = array(40,  8, 48, 16, 56, 24, 64, 32,
+			   39,  7, 47, 15, 55, 23, 63, 31,
+			   38,  6, 46, 14, 54, 22, 62, 30,
+			   37,  5, 45, 13, 53, 21, 61, 29,
+			   36,  4, 44, 12, 52, 20, 60, 28,
+			   35,  3, 43, 11, 51, 19, 59, 27,
+			   34,  2, 42, 10, 50, 18, 58, 26,
+			   33,  1, 41,  9, 49, 17, 57, 25);
+
+	foreach ($ip_table as $bit) {
+		$ip .= $clearText[$bit - 1];
+	}
+	$l[0] = substr($ip, 0, 32);
+	$r[0] = substr($ip, 32);
+	for ($index = 1; $index <= 16; $index++) {
+		$l[$index] = $r[$index - 1];
+		$r[$index] = des_xor($l[$index - 1], des_transform($r[$index - 1], $subKeys[$index]));
+	}
+
+	foreach ($ip1_table as $bit) {
+		$concat	= $r[16] . $l[16];
+		$cypherBlock .= $concat[$bit - 1];
+	}
+	return ($cypherBlock);
+}
+
+function des_make_subkeys($key) {
+	$pc1 = array(57, 49, 41, 33, 25, 17,  9,
+		      1, 58, 50, 42, 34, 26, 18,
+		     10,  2, 59, 51, 43, 35, 27,
+		     19, 11,  3, 60, 52, 44, 36,
+		     63, 55, 47, 39, 31, 23, 15,
+		      7, 62, 54, 46, 38, 30, 22,
+		     14,  6, 61, 53, 45, 37, 29,
+		     21, 13,  5, 28, 20, 12,  4);
+
+	$pc2 = array(14, 17, 11, 24,  1,  5,
+		      3, 28, 15,  6, 21, 10,
+		     23, 19, 12,  4, 26,  8,
+		     16,  7, 27, 20, 13,  2,
+		     41, 52, 31, 37, 47, 55,
+		     30, 40, 51, 45, 33, 48,
+		     44, 49, 39, 56, 34, 53,
+		     46, 42, 50, 36, 29, 32);
+
+	$shifts = array(1, 1, 2, 2,
+			2, 2, 2, 2,
+			1, 2, 2, 2,
+			2, 2, 2, 1);
+	foreach ($pc1 as $bit) {
+		$k .= $key[$bit - 1];
+	}
+	$index = 0;
+	$c[$index] = substr($k, 0, 28);
+	$d[$index] = substr($k, 28);
+	unset ($k);
+	foreach ($shifts as $positions) {
+		$index++;
+		$c[$index] = des_rotate_left ($c[$index - 1], $positions);
+		$d[$index] = des_rotate_left ($d[$index - 1], $positions);
+	}
+	for ($i = 1; $i <= 16; $i++) {
+		foreach ($pc2 as $bit) {
+			$concat = $c[$i] . $d[$i];
+			$k[$i] .= $concat[$bit - 1];
+		}
+	}
+	return ($k);
+}
+
+function des_transform($data, $key) {
+	$e_table = array(32,  1,  2,  3,  4,  5,
+			  4,  5,  6,  7,  8,  9,
+			  8,  9, 10, 11, 12, 13,
+			 12, 13, 14, 15, 16, 17,
+			 16, 17, 18, 19, 20, 21,
+			 20, 21, 22, 23, 24, 25,
+			 24, 25, 26, 27, 28, 29,
+			 28, 29, 30, 31, 32,  1);
+
+	$s = array(array(14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+			  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+			  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+			 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13),
+		   array(15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+			  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+			  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+			 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9),
+		   array(10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+			 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+			 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+			  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12),
+		   array( 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+			 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+			 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+			  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14),
+		   array( 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+			 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+			  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+			 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3),
+		   array(12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+			 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+			  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+			  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13),
+		   array( 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+			 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+			  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+			  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12),
+		   array(13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0,  12,  7,
+			  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+			  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13,  15, 3,  5,  8,
+			  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11));
+
+	$p_table = array(16,  7, 20, 21,
+                         29, 12, 28, 17,
+                          1, 15, 23, 26,
+                          5, 18, 31, 10,
+                          2,  8, 24, 14,
+                         32, 27,  3,  9,
+                         19, 13, 30,  6,
+                         22, 11,  4, 25);
+
+	$nybbles = array(chr(0x00).chr(0x00).chr(0x00).chr(0x00), chr(0x00).chr(0x00).chr(0x00).chr(0x01),
+			 chr(0x00).chr(0x00).chr(0x01).chr(0x00), chr(0x00).chr(0x00).chr(0x01).chr(0x01),
+			 chr(0x00).chr(0x01).chr(0x00).chr(0x00), chr(0x00).chr(0x01).chr(0x00).chr(0x01),
+			 chr(0x00).chr(0x01).chr(0x01).chr(0x00), chr(0x00).chr(0x01).chr(0x01).chr(0x01),
+			 chr(0x01).chr(0x00).chr(0x00).chr(0x00), chr(0x01).chr(0x00).chr(0x00).chr(0x01),
+			 chr(0x01).chr(0x00).chr(0x01).chr(0x00), chr(0x01).chr(0x00).chr(0x01).chr(0x01),
+			 chr(0x01).chr(0x01).chr(0x00).chr(0x00), chr(0x01).chr(0x01).chr(0x00).chr(0x01),
+			 chr(0x01).chr(0x01).chr(0x01).chr(0x00), chr(0x01).chr(0x01).chr(0x01).chr(0x01));
+
+
+	foreach ($e_table as $bit) {
+		$e .= $data[$bit - 1];
+	}
+	$ek = des_xor($e, $key);
+	for ($i = 0; $i < 8; $i++) {
+		$offset = $i * 6;
+		$sAddress = ord($ek[$offset]) * 0x20 +
+			    ord($ek[$offset + 1]) * 0x08 +
+			    ord($ek[$offset + 2]) * 0x04 +
+			    ord($ek[$offset + 3]) * 0x02 +
+			    ord($ek[$offset + 4]) +
+			    ord($ek[$offset + 5]) * 0x10;
+		$sResult .= $nybbles[$s[$i][$sAddress]];
+	}
+	foreach ($p_table as $bit) {
+		$p .= $sResult[$bit - 1];
+	}
+	return ($p);
+}
+
+function des_bits_to_bytes($bitStream) {
+	for ($i = 0; $i < strlen($bitStream); $i++) {
+		$val = ord($bitStream[$i]);
+		if ($val & 0x80) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x40) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x20) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x10) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x08) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x04) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x02) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+		if ($val & 0x01) {$byteStream .= chr(0x01);} else {$byteStream .= chr(0x00);}
+	}
+	return ($byteStream);
+}
+
+function des_bytes_to_bits($byteStream) {
+	for ($i = 0; $i < (strlen($byteStream) / 8); $i++) {
+		$offset	= $i * 8;
+		$value = ord($byteStream[$offset]) * 0x80 +
+			 ord($byteStream[$offset + 1]) * 0x40 +
+			 ord($byteStream[$offset + 2]) * 0x20 +
+			 ord($byteStream[$offset + 3]) * 0x10 +
+			 ord($byteStream[$offset + 4]) * 0x08 +
+			 ord($byteStream[$offset + 5]) * 0x04 +
+			 ord($byteStream[$offset + 6]) * 0x02 +
+			 ord($byteStream[$offset + 7]);
+		$bitStream .= chr($value);
+
+	}
+	return ($bitStream);
+}
+
+function des_rotate_left($input, $positions) {
+	return substr($input, $positions) . substr($input, 0, $positions);
+}
+
+function des_xor($a, $b) {
+	for ($i = 0; $i < strlen($a); $i++) {
+		$xor .= $a[$i] ^ $b[$i];
+	}
+	return $xor;
+}
+
+// DES helper function
+// input: 7-Bytes Key without parity
+// ouput: 8-Bytes Key with parity
+function des_add_parity($key) 
+{
+    static $odd_parity = array(
+        1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
+        16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
+        32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
+        49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
+        64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
+        81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
+        97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
+        112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
+        128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
+        145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
+        161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
+        176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
+        193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
+        208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
+        224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
+        241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254);
+
+    for ($i = 0; $i < strlen($key); $i++) {
+        $bin .= sprintf('%08s', decbin(ord($key{$i})));
+    }
+
+    $str1 = explode('-', substr(chunk_split($bin, 7, '-'), 0, -1));
+    foreach($str1 as $s) {
+        $x .= sprintf('%02s', dechex($odd_parity[bindec($s . '0')]));
+    }
+
+    return pack('H*', $x);
+
+}
diff -Nru php-radius-1.2.7/radius-1.4.0b1/examples/mschap.php php-radius-1.4.0~b1/radius-1.4.0b1/examples/mschap.php
--- php-radius-1.2.7/radius-1.4.0b1/examples/mschap.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/examples/mschap.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,97 @@
+<?php
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+include_once 'des.php';
+
+function NtPasswordHash($plain) 
+{
+    return mhash (MHASH_MD4, str2unicode($plain));
+}
+
+function str2unicode($str) 
+{
+
+    for ($i=0;$i<strlen($str);$i++) {
+        $a = ord($str{$i}) << 8;
+        $uni .= sprintf("%X",$a);
+    }
+    return pack('H*', $uni);
+}
+
+function GenerateChallenge($size = 8) 
+{
+    mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff);
+    for($i = 0; $i < $size; $i++) {
+        $chall .= pack('C', 1 + mt_rand() % 255);
+    }
+    return $chall;
+}
+
+function ChallengeResponse($challenge, $nthash) 
+{
+    while (strlen($nthash) < 21)
+        $nthash .= "\0";
+
+    $resp1 = des_encrypt_ecb(substr($nthash, 0, 7), $challenge);
+    $resp2 = des_encrypt_ecb(substr($nthash, 7, 7), $challenge);
+    $resp3 = des_encrypt_ecb(substr($nthash, 14, 7), $challenge);
+
+    return $resp1 . $resp2 . $resp3;
+}
+
+// MS-CHAPv2
+
+function GeneratePeerChallenge() 
+{
+    return GenerateChallenge(16);
+}
+
+function NtPasswordHashHash($hash) 
+{
+    return mhash (MHASH_MD4, $hash);
+}
+
+function ChallengeHash($challenge, $peerChallenge, $username) 
+{
+    return substr(mhash (MHASH_SHA1, $peerChallenge . $challenge . $username), 0, 8);
+}
+
+function GenerateNTResponse($challenge, $peerChallenge, $username, $password) 
+{
+    $challengeHash = ChallengeHash($challenge, $peerChallenge, $username);
+    $pwhash = NtPasswordHash($password);
+    return ChallengeResponse($challengeHash, $pwhash);
+}
+
+?>
diff -Nru php-radius-1.2.7/radius-1.4.0b1/examples/mschaptest.php php-radius-1.4.0~b1/radius-1.4.0b1/examples/mschaptest.php
--- php-radius-1.2.7/radius-1.4.0b1/examples/mschaptest.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/examples/mschaptest.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,68 @@
+<?php
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+include_once('mschap.php');
+
+
+echo "MS-CHAPv1 TEST\n";
+$pass = 'MyPw';
+$challenge = pack('H*', '102DB5DF085D3041');
+printf ("Test Challenge: %s\n", bin2hex($challenge));
+$unipw = str2unicode($pass);
+printf ("Unicode PW: %s\nexpected  : 4d00790050007700\n", bin2hex($unipw));
+$nthash = NtPasswordHash($pass);
+printf ("NT HASH   : %s\nexpected  : fc156af7edcd6c0edde3337d427f4eac\n", bin2hex($nthash));
+$challresp = ChallengeResponse($challenge, $nthash);
+printf ("ChallResp : %s\nexpected  : 4e9d3c8f9cfd385d5bf4d3246791956ca4c351ab409a3d61\n", bin2hex($challresp));
+echo "\n";
+
+echo "MS-CHAPv2 TEST\n";
+$user = 'User';
+$pass = 'clientPass';
+printf ("Username  : %s\nexpected  : 55736572\n", bin2hex($user));
+$challenge = pack('H*', 'd02e4386bce91226');
+printf ("Challenge     : %s\n", bin2hex($challenge));
+$authchallenge = pack('H*', '5b5d7c7d7b3f2f3e3c2c602132262628');
+printf ("Auth Challenge: %s\n", bin2hex($authchallenge));
+$peerChallenge = pack('H*', '21402324255E262A28295F2B3A337C7E');
+printf ("Peer Challenge: %s\n", bin2hex($peerChallenge));
+$nthash = NtPasswordHash($pass);
+printf ("NT HASH      : %s\nexpected     : 44ebba8d5312b8d611474411f56989ae\n", bin2hex($nthash));
+$nthashhash = NtPasswordHashHash($nthash);
+printf ("NT HASH-HASH : %s\nexpected     : 41c00c584bd2d91c4017a2a12fa59f3f\n", bin2hex($nthashhash));
+$resp = GenerateNtResponse($authchallenge, $peerChallenge, $user, $pass);
+printf ("ChallResp    : %s\nexpected     : 82309ecd8d708b5ea08faa3981cd83544233114a3d85d6df\n", bin2hex($resp));
+echo "\n";
+
+?>
diff -Nru php-radius-1.2.7/radius-1.4.0b1/examples/radius-acct.php php-radius-1.4.0~b1/radius-1.4.0b1/examples/radius-acct.php
--- php-radius-1.2.7/radius-1.4.0b1/examples/radius-acct.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/examples/radius-acct.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,158 @@
+<?php
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+if(!extension_loaded('radius')) {
+
+    if (preg_match('/windows/i', getenv('OS'))) {
+        dl('php_radius.dll');
+    } else {
+        dl('radius.so');
+    }
+
+}
+
+$username = 'sepp';
+$radserver = 'localhost';
+$radport = 1813;
+$starttime = time();
+$sharedsecret = 'testing123';
+
+if (!isset($REMOTE_ADDR)) $REMOTE_ADDR = '127.0.0.1';
+
+$res = radius_acct_open();
+echo "$res<br>\n";
+
+//if (!radius_config($res, '/etc/radius.conf')) {
+/*if (!radius_config($res, 'D:/php-devel/pear/PECL/radius/radius.conf')) {
+ echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+ exit;
+}*/
+
+
+if (!radius_add_server($res, $radserver, $radport, $sharedsecret, 3, 3)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_create_request($res, RADIUS_ACCOUNTING_REQUEST)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_string($res, RADIUS_NAS_IDENTIFIER, isset($HTTP_HOST) ? $HTTP_HOST : 'localhost'))  {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+ 
+if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+  
+if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_string($res, RADIUS_CALLING_STATION_ID, isset($REMOTE_HOST) ? $REMOTE_HOST : '127.0.0.1') == -1) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_string($res, RADIUS_USER_NAME, $username)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_addr($res, RADIUS_FRAMED_IP_ADDRESS, $REMOTE_ADDR)) {
+    echo 'RadiusError1:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+// RADIUS_START => start accounting
+// RADIUS_STOP => stop accounting
+if (!radius_put_int($res, RADIUS_ACCT_STATUS_TYPE, RADIUS_START)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+/* Generate a session ID */
+$sessionid = sprintf("%s:%d-%s", $REMOTE_ADDR, getmypid(), get_current_user());
+if (!radius_put_string($res, RADIUS_ACCT_SESSION_ID, $sessionid)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+// RADIUS_AUTH_RADIUS => authenticated via Radius
+// RADIUS_AUTH_LOCAL => authenicated local
+// RADIUS_AUTH_REMOTE => authenticated remote
+if (!radius_put_int($res, RADIUS_ACCT_AUTHENTIC, RADIUS_AUTH_LOCAL)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+sleep(3);
+// if RADIUS_ACCT_STATUS_TYPE == RADIUS_STOP 
+if (!radius_put_int($res, RADIUS_ACCT_TERMINATE_CAUSE, RADIUS_TERM_USER_REQUEST)) {
+    echo 'RadiusError2:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_int($res, RADIUS_ACCT_SESSION_TIME, time() - $starttime)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+// endif
+
+$req = radius_send_request($res);
+if (!$req) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+switch($req) {
+
+case RADIUS_ACCOUNTING_RESPONSE:
+    echo "Radius Accounting response<br>\n";    
+    break;
+
+default:
+    echo "Unexpected return value:$req\n<br>";
+    
+}
+
+
+radius_close($res);
+
+?>
diff -Nru php-radius-1.2.7/radius-1.4.0b1/examples/radius-auth.php php-radius-1.4.0~b1/radius-1.4.0b1/examples/radius-auth.php
--- php-radius-1.2.7/radius-1.4.0b1/examples/radius-auth.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/examples/radius-auth.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,388 @@
+<?php
+/*
+Copyright (c) 2003-2007, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+if(!extension_loaded('radius')) {
+
+    if (preg_match('/windows/i', getenv('OS'))) {
+        dl('php_radius.dll');
+    } else {
+        dl('radius.so');
+    }
+
+}
+
+$module = 'radius';
+$functions = get_extension_funcs($module);
+echo "Functions available in the test extension:<br>\n";
+foreach($functions as $func) echo $func . "<br>\n";
+
+$username = 'sepp';
+$password = 'sepp';
+$radserver = 'localhost';
+$radport = 1812;
+$sharedsecret = 'testing123';
+$auth_type = 'pap';
+//$auth_type = 'chap';
+//$auth_type = 'mschapv1';
+//$auth_type = 'mschapv2';
+
+$res = radius_auth_open();
+echo "$res<br>\n";
+
+//if (!radius_config($res, '/etc/radius.conf')) {
+/*if (!radius_config($res, 'D:/php-devel/pear/PECL/radius/radius.conf')) {
+ echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+ exit;
+}*/
+
+
+if (!radius_add_server($res, $radserver, $radport, $sharedsecret, 3, 3)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_add_server($res, $radserver, $radport, 'testing123', 3, 3)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_create_request($res, RADIUS_ACCESS_REQUEST)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_string($res, RADIUS_NAS_IDENTIFIER, isset($HTTP_HOST) ? $HTTP_HOST : 'localhost'))  {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+ 
+if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+  
+if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_string($res, RADIUS_CALLING_STATION_ID, isset($REMOTE_HOST) ? $REMOTE_HOST : '127.0.0.1') == -1) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_string($res, RADIUS_USER_NAME, $username)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if ($auth_type == 'chap') {
+    echo "CHAP<br>\n";
+
+    /* generate Challenge */
+    mt_srand(time());
+    $chall = mt_rand();
+
+    // FYI: CHAP = md5(ident + plaintextpass + challenge)
+    $chapval = pack('H*', md5(pack('Ca*',1 , $password . $chall)));
+//    $chapval = md5(pack('Ca*',1 , $password . $chall));
+    // Radius wants the CHAP Ident in the first byte of the CHAP-Password
+    $pass = pack('C', 1) . $chapval;
+
+    if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
+        echo 'RadiusError: RADIUS_CHAP_PASSWORD:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+
+    if (!radius_put_attr($res, RADIUS_CHAP_CHALLENGE, $chall)) {
+        echo 'RadiusError: RADIUS_CHAP_CHALLENGE:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+
+}  else if ($auth_type == 'mschapv1') {
+    echo "MS-CHAPv1<br>\n";
+    include_once('mschap.php');
+
+    $challenge = GenerateChallenge();
+    printf ("Challenge:%s\n", bin2hex($challenge));
+
+    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP_CHALLENGE, $challenge)) {
+        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP_CHALLENGE:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+
+    $ntresp = ChallengeResponse($challenge, NtPasswordHash($password));
+    $lmresp = str_repeat ("\0", 24);
+
+    printf ("NT Response:%s\n", bin2hex($ntresp));
+    // Response: chapid, flags (1 = use NT Response), LM Response, NT Response
+    $resp = pack('CCa48',1 , 1, $lmresp . $ntresp);
+    printf ("Response:%d %s\n", strlen($resp), bin2hex($resp));
+
+    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP_RESPONSE, $resp)) {
+        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP_RESPONSE:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+
+} else if ($auth_type == 'mschapv2') {
+    echo "MS-CHAPv2<br>\n";
+    include_once('mschap.php');
+
+    $authChallenge = GenerateChallenge(16);
+    printf ("Auth Challenge:%s\n", bin2hex($authChallenge));
+
+    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP_CHALLENGE, $authChallenge)) {
+        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP_CHALLENGE:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+
+    // we have no client, therefore we generate the Peer-Challenge
+    $peerChallenge = GeneratePeerChallenge();
+    printf ("Peer Challenge:%s\n", bin2hex($peerChallenge));
+
+    $ntresp = GenerateNTResponse($authChallenge, $peerChallenge, $username, $password);
+    $reserved = str_repeat ("\0", 8);
+
+    printf ("NT Response:%s\n", bin2hex($ntresp));
+    // Response: chapid, flags (1 = use NT Response), Peer challenge, reserved, Response
+    $resp = pack('CCa16a8a24',1 , 1, $peerChallenge, $reserved, $ntresp);
+    printf ("Response:%d %s\n", strlen($resp), bin2hex($resp));
+
+    if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_CHAP2_RESPONSE, $resp)) {
+        echo 'RadiusError: RADIUS_MICROSOFT_MS_CHAP2_RESPONSE:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+
+} else {
+    echo "PAP<br>\n";
+
+    if (!radius_put_string($res, RADIUS_USER_PASSWORD, "sepp")) {
+        echo 'RadiusError:' . radius_strerror($res). "<br>\n";
+        exit;
+    }
+}
+
+if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+$req = radius_send_request($res);
+if (!$req) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+}
+
+switch($req) {
+case RADIUS_ACCESS_ACCEPT:
+        echo "Radius Request accepted<br>\n";
+    break;
+
+case RADIUS_ACCESS_REJECT:
+    echo "Radius Request rejected<br>\n";
+    break;
+
+default:
+    echo "Unexpected return value:$req\n<br>";
+}
+
+while ($resa = radius_get_attr($res)) {
+
+    if (!is_array($resa)) {
+        printf ("Error getting attribute: %s\n",  radius_strerror($res));
+        exit;
+    }
+
+    $attr = $resa['attr'];
+    $data = $resa['data'];
+    //printf("Got Attr:%d %d Bytes %s\n", $attr, strlen($data), bin2hex($data));
+
+    switch ($attr) {
+
+    case RADIUS_FRAMED_IP_ADDRESS:
+        $ip = radius_cvt_addr($data);
+        echo "IP: $ip<br>\n";
+        break;
+
+    case RADIUS_FRAMED_IP_NETMASK:
+        $mask = radius_cvt_addr($data);
+        echo "MASK: $mask<br>\n";
+        break;
+
+    case RADIUS_FRAMED_MTU:
+        $mtu = radius_cvt_int($data);
+        echo "MTU: $mtu<br>\n";
+        break;
+
+    case RADIUS_FRAMED_COMPRESSION:
+        $comp = radius_cvt_int($data);
+        echo "Compression: $comp<br>\n";
+        break;
+
+    case RADIUS_SESSION_TIMEOUT:
+        $time = radius_cvt_int($data);
+        echo "Session timeout: $time<br>\n";
+        ini_set('max_execution_time', $time);
+        break;
+
+    case RADIUS_IDLE_TIMEOUT:
+        $idletime = radius_cvt_int($data);
+        echo "Idle timeout: $idletime<br>\n";
+        break;
+
+    case RADIUS_SERVICE_TYPE:
+        $type = radius_cvt_int($data);
+        echo "Service Type: $type<br>\n";
+        break;
+
+    case RADIUS_CLASS:
+        $class = radius_cvt_int($data);
+        echo "Class: $class<br>\n";
+        break;
+
+    case RADIUS_FRAMED_PROTOCOL:
+        $proto = radius_cvt_int($data);
+        echo "Protocol: $proto<br>\n";
+        break;
+
+    case RADIUS_FRAMED_ROUTING:
+        $rout = radius_cvt_int($data);
+        echo "Routing: $rout<br>\n";
+        break;
+
+    case RADIUS_FILTER_ID:
+        $id = radius_cvt_string($data);
+        echo "Filter ID: $id<br>\n";
+        break;
+
+    case RADIUS_VENDOR_SPECIFIC:
+        //printf ("Vendor specific (%d)<br>\n", $attr);
+
+        $resv = radius_get_vendor_attr($data);
+        if (is_array($resv)) {
+            $vendor = $resv['vendor'];
+            $attrv = $resv['attr'];
+            $datav = $resv['data'];
+
+            if ($vendor == RADIUS_VENDOR_MICROSOFT) {
+
+                switch ($attrv) {
+
+                case RADIUS_MICROSOFT_MS_CHAP2_SUCCESS:
+                    $mschap2resp = radius_cvt_string($datav);
+                    printf ("MS CHAPv2 success: %s<br>\n", $mschap2resp);                    
+                    break;
+
+                case RADIUS_MICROSOFT_MS_CHAP_ERROR:
+                    $errormsg = radius_cvt_string(substr($datav,1));
+                    echo "MS CHAP Error: $errormsg<br>\n";
+                    break;
+
+                case RADIUS_MICROSOFT_MS_CHAP_DOMAIN:
+                    $domain = radius_cvt_string($datav);
+                    echo "MS CHAP Domain: $domain<br>\n";
+                    break;
+
+                case RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY:
+                    $policy = radius_cvt_int($datav);
+                    echo "MS MPPE Policy: $policy<br>\n";
+                    break;
+
+                case RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES:
+                    $type = radius_cvt_int($datav);
+                    echo "MS MPPE Type: $type<br>\n";
+                    break;
+
+                case RADIUS_MICROSOFT_MS_CHAP_MPPE_KEYS:
+                    $demangled = radius_demangle($res, $datav);
+                    $lmkey = substr($demangled, 0, 8);
+                    $ntkey = substr($demangled, 8, RADIUS_MPPE_KEY_LEN);
+                    printf ("MS MPPE Keys: LM-Key: %s NT-Key: %s<br>\n", bin2hex($lmkey), bin2hex($ntkey));
+                    break;
+
+                case RADIUS_MICROSOFT_MS_MPPE_SEND_KEY:
+                    $demangled = radius_demangle_mppe_key($res, $datav);
+                    printf ("MS MPPE Send Key: %s<br>\n", bin2hex($demangled));
+                    break;
+
+                case RADIUS_MICROSOFT_MS_MPPE_RECV_KEY:
+                    $demangled = radius_demangle_mppe_key($res, $datav);
+                    printf ("MS MPPE Send Key: %s<br>\n", bin2hex($demangled));
+                    break;
+
+                case RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER:
+                    $server = radius_cvt_string($datav);
+                    printf ("MS Primary DNS Server: %s<br>\n", $server);
+                    break;
+
+                default:
+                    printf("Unexpected Microsoft attribute: %d<br>\n", $attrv);
+                }
+
+            }
+
+        } else {
+            printf ("Error getting Vendor attribute %s<br>\n", radius_strerror($res));
+        }
+        break;
+
+    default:
+        printf("Unexpected attribute: %d<br>\n", $attr);
+    }
+}
+
+$secret = radius_server_secret($res);
+if (!$secret) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+} else {
+    echo "Shared Secret:$secret<br>\n";
+}
+
+$authent = radius_request_authenticator($res);
+if (!$authent) {
+    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
+    exit;
+} else {
+    printf ("Request Authenticator:%s Len:%d<br>\n", bin2hex($authent), strlen($authent));
+}
+
+radius_close($res);
+
+?>
diff -Nru php-radius-1.2.7/radius-1.4.0b1/LICENSE php-radius-1.4.0~b1/radius-1.4.0b1/LICENSE
--- php-radius-1.2.7/radius-1.4.0b1/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/LICENSE	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru php-radius-1.2.7/radius-1.4.0b1/Makefile.in php-radius-1.4.0~b1/radius-1.4.0b1/Makefile.in
--- php-radius-1.2.7/radius-1.4.0b1/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/Makefile.in	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,9 @@
+# $Id$
+
+LTLIBRARY_NAME          = libradius.la
+LTLIBRARY_SOURCES       = radius.c radlib.c
+LTLIBRARY_SHARED_NAME   = radius.la
+LTLIBRARY_LIBADD  			= $(RADIUS_LIBADD)
+LTLIBRARY_SHARED_LIBADD = $(RADIUS_SHARED_LIBADD)
+
+include $(top_srcdir)/build/dynlib.mk
\ No newline at end of file
diff -Nru php-radius-1.2.7/radius-1.4.0b1/pecl-compat/compat.h php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/compat.h
--- php-radius-1.2.7/radius-1.4.0b1/pecl-compat/compat.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/compat.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,110 @@
+/*
+  +----------------------------------------------------------------------+
+  | Compatibility macros for different PHP versions                      |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2015 The PHP Group                                     |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Francois Laupretre <francois@tekwire.net>                    |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef _COMPAT_H
+#define _COMPAT_H
+
+#define PECL_COMPAT_VERSION 1.2
+
+#include <stdio.h>
+#include <assert.h>
+#include <fcntl.h>
+
+#include "php.h"
+#include "zend.h"
+#include "zend_extensions.h"
+#include "zend_API.h"
+
+#define PHP_5_0_X_API_NO                220040412
+#define PHP_5_1_X_API_NO                220051025
+#define PHP_5_2_X_API_NO                220060519
+#define PHP_5_3_X_API_NO                220090626
+#define PHP_5_4_X_API_NO                220100525
+#define PHP_5_5_X_API_NO                220121212
+#define PHP_5_6_X_API_NO                220131226
+
+#if PHP_MAJOR_VERSION >= 7
+#	define PHP_7
+#endif
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
+#if HAVE_STRING_H
+#	include <string.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#	include <sys/types.h>
+#endif
+
+#ifdef PHP_WIN32
+#	include "win32/time.h"
+#elif defined(NETWARE)
+#	include <sys/timeval.h>
+#	include <sys/time.h>
+#else
+#	include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
+#	include <sys/resource.h>
+#endif
+
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#	include <stdlib.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#	include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#	include <sys/stat.h>
+#endif
+
+#ifdef PHP_WIN32
+#include <win32/php_stdint.h>
+#else
+#include <inttypes.h>
+#endif
+
+#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO
+#include "zend_virtual_cwd.h"
+#else
+#include "TSRM/tsrm_virtual_cwd.h"
+#endif
+
+#ifdef PHP_7
+#include "Zend/zend_portability.h"
+#endif
+
+/*-- Include submodules */
+
+#include "src/misc.h"
+#include "src/zend_string.h"
+#include "src/zend_hash.h"
+#include "src/zend_API.h"
+#include "src/zend_resource.h"
+
+#endif /* _COMPAT_H */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/misc.h php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/misc.h
--- php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/misc.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/misc.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,253 @@
+/*
+  +----------------------------------------------------------------------+
+  | Compatibility between PHP versions                                   |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2015 The PHP Group                                     |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Francois Laupretre <francois@tekwire.net>                    |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef __PECL_COMPAT_MISC_H
+#define __PECL_COMPAT_MISC_H 1
+
+#ifdef PHP_7
+/*============================================================================*/
+
+typedef zend_string * OPENED_PATH_PTR; /* Type of stream opened_path argument */
+typedef size_t        COMPAT_ARG_SIZE_T; /* Size of string arguments */
+typedef zend_long     COMPAT_ARG_LONG_T; /* Type of long (integer) arguments */
+
+#define compat_zval_ptr_dtor(zp)	zval_ptr_dtor(zp)
+
+#else
+/*== PHP 5 ===================================================================*/
+
+typedef char *    OPENED_PATH_PTR;
+typedef off_t     zend_off_t;
+typedef int       COMPAT_ARG_SIZE_T;
+typedef long      COMPAT_ARG_LONG_T;
+typedef long      zend_long;
+
+#define compat_zval_ptr_dtor(zp)	zval_dtor(zp)
+
+#endif
+/*============================================================================*/
+
+#ifndef MIN
+#	define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef MAX
+#	define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+/*---------------------------------------------------------------*/
+/* (Taken from pcre/pcrelib/internal.h) */
+/* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),
+define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY
+is set. Otherwise, include an emulating function for those systems that have
+neither (there are some non-Unix environments where this is the case). This
+assumes that all calls to memmove are moving strings upwards in store,
+which is the case in this extension. */
+
+#if ! HAVE_MEMMOVE
+#	ifdef memmove
+#		undef  memmove					/* some systems may have a macro */
+#	endif
+#	if HAVE_BCOPY
+#		define memmove(a, b, c) bcopy(b, a, c)
+#	else
+		static void *my_memmove(unsigned char *dest, const unsigned char *src,
+								size_t n)
+		{
+			int i;
+
+			dest += n;
+			src += n;
+			for (i = 0; i < n; ++i)
+				*(--dest) = *(--src);
+		}
+#		define memmove(a, b, c) my_memmove(a, b, c)
+#	endif	/* not HAVE_BCOPY */
+#endif		/* not HAVE_MEMMOVE */
+
+#ifdef _AIX
+#	undef PHP_SHLIB_SUFFIX
+#	define PHP_SHLIB_SUFFIX "a"
+#endif
+
+#ifndef ZVAL_IS_ARRAY
+#define ZVAL_IS_ARRAY(zp)	(Z_TYPE_P((zp))==IS_ARRAY)
+#endif
+
+#ifndef ZVAL_IS_STRING
+#define ZVAL_IS_STRING(zp)	(Z_TYPE_P((zp))==IS_STRING)
+#endif
+
+#ifndef ZVAL_IS_LONG
+#define ZVAL_IS_LONG(zp)	(Z_TYPE_P((zp))==IS_LONG)
+#endif
+
+#ifndef ZVAL_IS_BOOL
+#define ZVAL_IS_BOOL(zp)	(Z_TYPE_P((zp))==IS_BOOL)
+#endif
+
+#ifndef INIT_ZVAL
+#define INIT_ZVAL(z) memset(&z, 0, sizeof(z))
+#endif
+
+#ifndef ZVAL_UNDEF
+#define ZVAL_UNDEF(z) INIT_ZVAL(*(z))
+#endif
+
+#ifndef MAKE_STD_ZVAL
+#define MAKE_STD_ZVAL(zp) { zp = emalloc(sizeof(zval)); INIT_ZVAL(*zp); }
+#endif
+
+#ifndef ALLOC_INIT_ZVAL
+#define ALLOC_INIT_ZVAL(zp) MAKE_STD_ZVAL(zp)
+#endif
+
+#ifndef ZEND_ASSUME
+#if defined(ZEND_WIN32) && !defined(__clang__)
+# define ZEND_ASSUME(c) __assume(c)
+#else
+# define ZEND_ASSUME(c)
+#endif
+#endif
+
+#ifndef ZEND_ASSERT
+#if ZEND_DEBUG
+# define ZEND_ASSERT(c) assert(c)
+#else
+# define ZEND_ASSERT(c) ZEND_ASSUME(c)
+#endif
+#endif
+
+#ifndef EMPTY_SWITCH_DEFAULT_CASE
+/* Only use this macro if you know for sure that all of the switches values
+   are covered by its case statements */
+#if ZEND_DEBUG
+# define EMPTY_SWITCH_DEFAULT_CASE() default: ZEND_ASSERT(0); break;
+#else
+# define EMPTY_SWITCH_DEFAULT_CASE() default: ZEND_ASSUME(0); break;
+#endif
+#endif
+
+#ifndef ZEND_IGNORE_VALUE
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZEND_IGNORE_VALUE(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
+#else
+# define ZEND_IGNORE_VALUE(x) ((void) (x))
+#endif
+#endif
+
+#if PHP_API_VERSION >= 20100412
+	typedef size_t PHP_ESCAPE_HTML_ENTITIES_SIZE;
+#else
+	typedef int PHP_ESCAPE_HTML_ENTITIES_SIZE;
+#endif
+
+/* Avoid a warning when compiling stream wrapper declarations for
+   openfile/opendir/url_stat */
+
+#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO
+#	define COMPAT_STREAM_CONST_DECL const
+#else
+#	define COMPAT_STREAM_CONST_DECL
+#endif
+
+#ifndef ZEND_MODULE_GLOBALS_ACCESSOR
+#	ifdef ZTS
+#		define ZEND_MODULE_GLOBALS_ACCESSOR(module_name, v) \
+			TSRMG(module_name##_globals_id, zend_##module_name##_globals *, v)
+#	else
+#		define ZEND_MODULE_GLOBALS_ACCESSOR(module_name, v) \
+			(module_name##_globals.v)
+#	endif
+#endif
+
+#ifndef ZEND_MODULE_GLOBALS_BULK
+#	ifdef ZTS
+#		define ZEND_MODULE_GLOBALS_BULK(module_name) \
+			((zend_##module_name##_globals *) \
+				(*((void ***) tsrm_ls))[module_name##_globals_id - 1])
+#	else
+#		define ZEND_MODULE_GLOBALS_BULK(module_name) \
+			(&module_name##_globals)
+#	endif
+#endif
+
+#ifndef ZEND_TSRMLS_CACHE_DEFINE
+#	define ZEND_TSRMLS_CACHE_DEFINE()
+#endif
+
+#ifndef ZEND_TSRMLS_CACHE_UPDATE
+#	define ZEND_TSRMLS_CACHE_UPDATE()
+#endif
+
+#ifndef PHP_FE_END
+# define PHP_FE_END { NULL, NULL, NULL }
+#endif
+
+#ifndef ZEND_MOD_END
+	/* for php < 5.3.7 */
+#	define ZEND_MOD_END {NULL, NULL, NULL}
+#endif
+
+/*============================================================================*/
+/* Duplicate a memory buffer */
+/* Supports zero size (allocates 1 byte) */
+
+static zend_always_inline void *_compat_dup(const void *ptr, size_t size, int persistent)
+{
+	char *p;
+
+	if (!ptr) return NULL;
+	if (size) {
+		p = pemalloc(size, persistent);
+		memmove(p, ptr, size);
+	} else {
+		p = pemalloc(1,persistent);
+		(*p) = '\0'; /* Ensures deterministic behavior */
+	}
+
+	return p;
+}
+
+/*---------------------------------------------------------------*/
+/* Duplicate a string and set terminating null.
+   Input string does not have to be null-terminated */
+
+static zend_always_inline void *_compat_dup_str(const void *ptr, size_t size, int persistent)
+{
+	char *p;
+
+	if (!ptr) return NULL;
+
+	p = pemalloc(size + 1, persistent);
+	if (size) memmove(p, ptr, size);
+	p[size] = '\0';
+	return p;
+}
+
+/*-----------------------------------------------------*/
+/* Fatal error - display message and abort process */
+
+static zend_always_inline void compat_unsupported(char *msg)
+{
+	php_error(E_CORE_ERROR, "This feature is not supported in this environment : %s", msg);
+	exit(1);
+}
+
+/*============================================================================*/
+#endif	/* __PECL_COMPAT_MISC_H */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_API.h php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_API.h
--- php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_API.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_API.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+  +----------------------------------------------------------------------+
+  | Compatibility macros for different PHP versions                      |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2016 The PHP Group                                     |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Adam Harvey <aharvey@php.net>                                |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef _COMPAT_ZEND_API_H
+#define _COMPAT_ZEND_API_H
+
+#ifdef PHP_7
+/*============================================================================*/
+
+#else
+/*== PHP 5 ===================================================================*/
+
+/*
+ * Many string-related macros used to take duplicate parameters, which
+ * specified whether the string should be duplicated or not. In practice,
+ * almost all code used 1, so PHP 7 always duplicates.
+ *
+ * This header redefines the relevant macros to match PHP 7.
+ */
+
+#undef ZVAL_STRING
+#define ZVAL_STRING(z, s) do { \
+		const char *__s = (s); \
+		zval *__z = (z); \
+		Z_STRLEN_P(__z) = strlen(__s); \
+		Z_STRVAL_P(__z) = estrndup(__s, Z_STRLEN_P(__z)); \
+		Z_TYPE_P(__z) = IS_STRING; \
+	} while (0)
+
+#undef ZVAL_STRINGL
+#define ZVAL_STRINGL(z, s, l) do { \
+		const char *__s = (s); \
+		int __l = (l); \
+		zval *__z = (z); \
+		Z_STRLEN_P(__z) = __l; \
+		Z_STRVAL_P(__z) = estrndup(__s, __l); \
+		Z_TYPE_P(__z) = IS_STRING; \
+	} while (0)
+
+#undef RETVAL_STRING
+#define RETVAL_STRING(s)     ZVAL_STRING(return_value, (s))
+
+#undef RETVAL_STRINGL
+#define RETVAL_STRINGL(s, l) ZVAL_STRINGL(return_value, (s), (l))
+
+#undef RETURN_STRING
+#define RETURN_STRING(s)     { RETVAL_STRING(s); return; }
+
+#undef RETURN_STRINGL
+#define RETURN_STRINGL(s, l) { RETVAL_STRINGL(s, l); return; }
+
+#undef add_assoc_string
+#define add_assoc_string(__arg, __key, __str) add_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, 1)
+
+#undef add_assoc_stringl
+#define add_assoc_stringl(__arg, __key, __str, __len) add_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __len, 1)
+
+#endif /* PHP_7 */
+/*============================================================================*/
+
+#endif /* _COMPAT_ZEND_API_H */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_hash.h php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_hash.h
--- php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_hash.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_hash.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,384 @@
+/*
+  +----------------------------------------------------------------------+
+  | zend_hash compatibility layer for PHP 5 & 7							 |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2005-2007 The PHP Group								 |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,		 |
+  | that is bundled with this package in the file LICENSE, and is		 |
+  | available through the world-wide-web at the following url:			 |
+  | http://www.php.net/license/3_01.txt.								 |
+  | If you did not receive a copy of the PHP license and are unable to	 |
+  | obtain it through the world-wide-web, please send a note to			 |
+  | license@php.net so we can mail you a copy immediately.				 |
+  +----------------------------------------------------------------------+
+  | Author: Francois Laupretre <francois@tekwire.net>					 |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef _COMPAT_ZEND_HASH_H
+#define _COMPAT_ZEND_HASH_H
+
+#include "zend_hash.h"
+
+#ifdef PHP_7
+/*============================================================================*/
+
+#define compat_zend_hash_exists(ht, key) zend_hash_exists(ht, key)
+
+#define compat_zend_hash_str_exists(ht, str, len) zend_hash_str_exists(ht, str, len)
+
+#define COMPAT_HASH_PTR(_zp) (&(Z_PTR_P(_zp)))
+
+/*---------*/
+/* Changes from original version:
+	- If numeric key, returned (zend_string *) is set to NULL.
+	- If non null, returned zend_string must be released.
+*/
+static zend_always_inline int compat_zend_hash_get_current_key_ex(const HashTable *ht
+	, zend_string **str_index, zend_ulong *num_index, HashPosition *pos)
+{
+	int status;
+
+	if (str_index) (*str_index) = NULL;
+	status = zend_hash_get_current_key_ex(ht, str_index, num_index, pos);
+	if (*str_index) zend_string_addref(*str_index);
+	return status;
+}
+
+/*---------*/
+/* Added - This function is equivalent to the PHP 5 version of
+   zend_hash_get_current_key_ex() */
+
+static zend_always_inline int compat_zend_hash_str_get_current_key_ex(const HashTable *ht
+	, char **str_index, size_t *str_length, zend_ulong *num_index
+	, zend_bool duplicate, HashPosition *pos)
+{
+	int status;
+	zend_string *zp;
+
+	zp = NULL;
+	status = zend_hash_get_current_key_ex(ht, &zp, num_index, pos);
+	if (zp) {
+		if (duplicate) {
+			(*str_index) = estrndup(ZSTR_VAL(zp), ZSTR_LEN(zp));
+		} else {
+			(*str_index) = ZSTR_VAL(zp);
+		}
+		(*str_length) = ZSTR_LEN(zp);
+	}
+	return status;
+}	
+
+/*---------*/
+
+static zend_always_inline void *compat_zend_hash_get_current_data_ptr_ex(HashTable *ht
+	, HashPosition *pos)
+{
+	zval *zp;
+
+	zp = zend_hash_get_current_data_ex(ht, pos);
+	return Z_PTR_P(zp);
+}
+
+#define compat_zend_hash_get_current_data_ptr(ht) \
+	compat_zend_hash_get_current_data_ptr_ex(ht, &(ht)->nInternalPointer)
+
+/*---------*/
+
+static zend_always_inline void *compat_zend_hash_get_current_data_ex(HashTable *ht
+	, HashPosition *pos)
+{
+	return (void *)zend_hash_get_current_data_ex(ht, pos);
+}
+
+#define compat_zend_hash_get_current_data(ht) \
+	compat_zend_hash_get_current_data_ex(ht, &(ht)->nInternalPointer)
+
+#define compat_zend_hash_get_current_zval_ex(ht, pos) \
+		(zval *)compat_zend_hash_get_current_data_ex(ht, pos)
+
+#define compat_zend_hash_get_current_zval(ht) \
+	compat_zend_hash_get_current_zval_ex(ht, &(ht)->nInternalPointer)
+
+#else
+/*= PHP 5 ====================================================================*/
+
+#ifndef HASH_KEY_NON_EXISTENT
+#define HASH_KEY_NON_EXISTENT HASH_KEY_NON_EXISTANT
+#endif
+
+#define COMPAT_HASH_PTR(_zp) (_zp)
+
+/*------------------------------------------------*/
+
+static zend_always_inline void *zend_hash_add_ptr(HashTable *ht
+	, zend_string *key, void *pData)
+{
+	int status;
+
+	status = zend_hash_quick_add(ht, ZSTR_VAL(key), (uint)(ZSTR_LEN(key) + 1)
+		, (ulong)ZSTR_HASH(key), &pData, sizeof(void *), NULL);
+	return (status == SUCCESS ? pData : NULL);
+}
+
+#define zend_hash_add_new_ptr(ht, key, pData) zend_hash_add_ptr(ht, key, pData)
+
+#define zend_hash_add_mem(ht, key, pData, size) \
+	zend_hash_add_ptr(ht, key, _compat_dup(pData, size, ht->persistent))
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_str_add_ptr(HashTable *ht
+	, const char *str, size_t len, void *pData)
+{
+	int status;
+	char *strn = _compat_dup_str(str, len, 0);
+
+	status = zend_hash_add(ht, strn, len + 1, &pData, sizeof(void *), NULL);
+	efree(strn);
+	return (status == SUCCESS ? pData : NULL);
+}
+
+#define zend_hash_str_add_new_ptr(ht, str, len, pData) zend_hash_str_add_ptr(ht, str, len, pData)
+
+#define zend_hash_str_add_mem(ht, str, len, pData, size) \
+	zend_hash_str_add_ptr(ht, str, len, _compat_dup(pData, size, ht->persistent))
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_index_add_ptr(HashTable *ht
+	, zend_ulong h, void *pData)
+{
+	int status;
+
+	status = zend_hash_index_update(ht, (ulong)h, &pData, sizeof(void *), NULL);
+	return (status == SUCCESS ? pData : NULL);
+}
+
+#define zend_hash_index_add_new_ptr(ht, h, pData) \
+	zend_hash_index_add_ptr(ht, h, pData)
+
+#define zend_hash_index_add_mem(ht, h, pData, size) \
+	zend_hash_index_add_ptr(ht, h, _compat_dup(pData, size, ht->persistent))
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_next_index_insert_ptr(HashTable *ht
+	, void *pData)
+{
+	int status;
+
+	status = zend_hash_next_index_insert(ht, &pData, sizeof(void *), NULL);
+	return (status == SUCCESS ? pData : NULL);
+}
+
+#define zend_hash_next_index_insert_mem(ht, pData, size) \
+	zend_hash_next_index_insert_ptr(ht, _compat_dup(pData, size, ht->persistent))
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_update_ptr(HashTable *ht
+	, zend_string *key, void *pData)
+{
+	int status;
+
+	status = zend_hash_quick_update(ht, ZSTR_VAL(key), (uint)(ZSTR_LEN(key) + 1)
+		, (ulong)ZSTR_HASH(key), &pData, sizeof(void *), NULL);
+	return (status == SUCCESS ? pData : NULL);
+}
+
+#define zend_hash_update_mem(ht, key, pData, size) \
+	zend_hash_update_ptr(ht, key, _compat_dup(pData, size, ht->persistent))
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_str_update_ptr(HashTable *ht
+	, const char *str, size_t len, void *pData)
+{
+	int status;
+	char *strn = _compat_dup_str(str, len, 0);
+
+	status = zend_hash_update(ht, strn, len + 1, &pData, sizeof(void *), NULL);
+	efree(strn);
+	return (status == SUCCESS ? pData : NULL);
+}
+
+#define zend_hash_str_upate_mem(ht, str, len, pData, size) \
+	zend_hash_str_update_ptr(ht, str, len, _compat_dup(pData, size, ht->persistent))
+
+#define zend_hash_index_update_ptr(ht, h, pData) \
+	zend_hash_index_add_ptr(ht, h, pData)
+
+#define zend_hash_index_update_mem(ht, h, pData, size) \
+	zend_hash_index_add_mem(ht, h, pData, size)
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_find_ptr(const HashTable *ht
+	, zend_string *key)
+{
+	int status;
+	void **p;
+
+	status = zend_hash_quick_find(ht, ZSTR_VAL(key), (uint)(ZSTR_LEN(key) + 1)
+		, (ulong)ZSTR_HASH(key), (void **)(&p));
+	return (status == SUCCESS ? (*p) : NULL);
+}
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_str_find_ptr(const HashTable *ht
+	, const char *str, size_t len)
+{
+	int status;
+	void **p;
+	char *strn = _compat_dup_str(str, len, 0);
+
+	status = zend_hash_find(ht, strn, len + 1, (void **)(&p));
+	efree(strn);
+	return (status == SUCCESS ? (*p) : NULL);
+}
+
+/*---------*/
+
+static zend_always_inline void *zend_hash_index_find_ptr(const HashTable *ht
+	, zend_ulong h)
+{
+	int status;
+	void **p;
+
+	status = zend_hash_index_find(ht, h, (void **)(&p));
+	return (status == SUCCESS ? (*p) : NULL);
+}
+
+/*---------*/
+
+static zend_always_inline zend_bool compat_zend_hash_exists(const HashTable *ht
+	, zend_string *key)
+{
+	return zend_hash_quick_exists(ht, ZSTR_VAL(key), (uint)(ZSTR_LEN(key) + 1)
+		, (ulong)ZSTR_HASH(key));
+}
+
+/*---------*/
+
+static zend_always_inline zend_bool compat_zend_hash_str_exists(const HashTable *ht
+	, const char *str, size_t len)
+{
+	zend_bool status;
+	char *strn = _compat_dup_str(str, len, 0);
+
+	status = zend_hash_exists(ht, strn, (uint)(len + 1));
+	efree(strn);
+	return status;
+}
+
+/*---------*/
+/* Changes from original version:
+	- Returns a zend_string
+	- If key is a string, returned zend_string must be released.
+*/
+static zend_always_inline int compat_zend_hash_get_current_key_ex(const HashTable *ht
+	, zend_string **str_index, zend_ulong *num_index, HashPosition *pos)
+{
+	int status;
+	char *str;
+	uint str_length;
+	ulong num;
+
+	status = zend_hash_get_current_key_ex(ht, &str, &str_length, &num, 0, pos);
+	if (status == HASH_KEY_IS_STRING) {
+		(*str_index) = zend_string_init(str, str_length - 1, ht->persistent);
+	} else if (status == HASH_KEY_IS_LONG) {
+		(*num_index) = (zend_ulong)num;
+	}
+	return status;
+}
+
+/*---------*/
+/* Diff with original :
+	- Type casts
+	- Return string length, without trailing null */
+
+static zend_always_inline int compat_zend_hash_str_get_current_key_ex(const HashTable *ht
+	, char **str_index, size_t *str_length, zend_ulong *num_index
+	, zend_bool duplicate, HashPosition *pos)
+{
+	int status;
+	uint length;
+	ulong num;
+
+	status = zend_hash_get_current_key_ex(ht, str_index, &length, &num, duplicate, pos);
+	if (status == HASH_KEY_IS_STRING) {
+		(*str_length) = (size_t)(length - 1);
+	} else if (status == HASH_KEY_IS_LONG) {
+		(*num_index) = (zend_ulong)num;
+	}
+	return status;
+}
+
+/*---------*/
+
+static zend_always_inline void *compat_zend_hash_get_current_data_ptr_ex(HashTable *ht
+	, HashPosition *pos)
+{
+	int status;
+	void **p;
+
+	status = zend_hash_get_current_data_ex(ht, (void **)(&p), pos);
+	return ((status == SUCCESS) ? (*p) : NULL);
+}
+
+#define compat_zend_hash_get_current_data_ptr(ht) \
+	compat_zend_hash_get_current_data_ptr_ex(ht, NULL)
+
+/*---------*/
+
+static zend_always_inline void *compat_zend_hash_get_current_data_ex(HashTable *ht
+	, HashPosition *pos)
+{
+	int status;
+	void **p;
+
+	status = zend_hash_get_current_data_ex(ht, (void **)(&p), pos);
+	return ((status == SUCCESS) ? p : NULL);
+}
+
+#define compat_zend_hash_get_current_data(ht) \
+	compat_zend_hash_get_current_data_ex(ht, NULL)
+
+#define compat_zend_hash_get_current_zval_ex(ht, pos) \
+		*((zval **)compat_zend_hash_get_current_data_ex(ht, pos))
+
+#define compat_zend_hash_get_current_zval(ht) \
+	compat_zend_hash_get_current_zval_ex(ht, NULL)
+
+/*------------------------------------------------------------*/
+
+#define ZEND_HASH_FOREACH(_ht, indirect) do { \
+	HashPosition _pos; \
+	for (zend_hash_internal_pointer_reset_ex(_ht, &_pos) \
+		;;zend_hash_move_forward_ex(_ht, &_pos)) { \
+		if (zend_hash_has_more_elements_ex(_ht, &_pos) != SUCCESS) break;
+
+#define ZEND_HASH_FOREACH_END() \
+	} \
+} while (0)
+
+#define ZEND_HASH_FOREACH_PTR(_ht, _ptr) \
+	ZEND_HASH_FOREACH(_ht, 0); \
+	_ptr = compat_zend_hash_get_current_data_ptr_ex(_ht, &_pos);
+
+#define ZEND_HASH_FOREACH_NUM_KEY(_ht, _h) \
+	ZEND_HASH_FOREACH(_ht, 0); \
+	compat_zend_hash_get_current_key_ex(_ht, NULL, &_h, &_pos);
+
+#define ZEND_HASH_FOREACH_NUM_KEY_PTR(_ht, _h, _ptr) \
+	ZEND_HASH_FOREACH(_ht, 0); \
+	_ptr = compat_zend_hash_get_current_data_ptr_ex(_ht, &_pos); \
+	compat_zend_hash_get_current_key_ex(_ht, NULL, &_h, &_pos);
+
+/*============================================================================*/
+#endif /* PHP_7 */
+#endif /* _COMPAT_ZEND_HASH_H */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_resource.h php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_resource.h
--- php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_resource.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_resource.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,140 @@
+/*
+  +----------------------------------------------------------------------+
+  | Compatibility macros for different PHP versions                      |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2016 The PHP Group                                     |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Adam Harvey <aharvey@php.net>                                |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef _COMPAT_ZEND_RESOURCE_H
+#define _COMPAT_ZEND_RESOURCE_H
+
+/*
+ * The PHP 5 and PHP 7 resource APIs use the same function names for mutually
+ * incompatible functions, which is unfortunate. A simple version of the PHP 5
+ * macro API can be implemented on top of the PHP 7 API, but not vice versa
+ * (since, for example, zend_register_resource() in PHP 5 also sets the zval,
+ * which is a separate action in PHP 7).
+ *
+ * Instead of using preprocessor trickery to try to mangle things into a sane
+ * API, I've implemented a minimal API that supports basic resource handling
+ * and delegates appropriately on both versions.
+ *
+ * Destructors should be registered using the normal
+ * zend_register_list_destructors() or zend_register_list_destructors_ex()
+ * functions. The destructor function should take a "zend_resource *" (there is
+ * an appropriate typedef in the PHP 5 section to make this work); as only a
+ * subset of fields are available across PHP versions, this should be treated
+ * as this struct in effect:
+ *
+ * typedef struct {
+ *   void *ptr;
+ *   int   type;
+ * } zend_resource;
+ *
+ * Accessing other fields will likely result in compilation errors and/or
+ * segfaults.
+ */
+
+/**
+ * Deletes the resource.
+ *
+ * On PHP 5, this is equivalent to zend_list_delete(Z_LVAL_P(zv)).
+ * On PHP 7, this is equivalent to zend_list_close(Z_RES_P(zv)).
+ *
+ * @param zv The IS_RESOURCE zval to delete.
+ */
+static void compat_zend_delete_resource(const zval *zv TSRMLS_DC);
+
+/**
+ * Fetches the resource.
+ *
+ * This API does not support the default ID that's possible with the PHP 5
+ * zend_fetch_resource() API, and will always set that value to -1.
+ *
+ * @param zv             The IS_RESOURCE zval to fetch.
+ * @param rsrc_type_name The type name to use in error messages.
+ * @param rsrc_type      The resource type ID.
+ * @return A void pointer to the resource, which needs to be typecast, or NULL
+ *         on error.
+ */
+static void *compat_zend_fetch_resource(zval *zv, const char *rsrc_type_name, int rsrc_type TSRMLS_DC);
+
+/**
+ * Registers a new resource.
+ *
+ * @param zv        The zval to set to IS_RESOURCE with the new resource value.
+ * @param ptr       A void pointer to the resource.
+ * @param rsrc_type The resource type ID.
+ */
+static void compat_zend_register_resource(zval *zv, void *ptr, int rsrc_type TSRMLS_DC);
+
+#ifdef PHP_7
+/*============================================================================*/
+
+static void compat_zend_delete_resource(const zval *zv TSRMLS_DC)
+{
+	if (IS_RESOURCE != Z_TYPE_P(zv)) {
+		return;
+	}
+
+	zend_list_close(Z_RES_P(zv));
+}
+
+static void *compat_zend_fetch_resource(zval *zv, const char *rsrc_type_name, int rsrc_type TSRMLS_DC)
+{
+	if (IS_RESOURCE != Z_TYPE_P(zv)) {
+		return NULL;
+	}
+
+	return zend_fetch_resource(Z_RES_P(zv), rsrc_type_name, rsrc_type);
+}
+
+static void compat_zend_register_resource(zval *zv, void *ptr, int rsrc_type TSRMLS_DC)
+{
+	ZVAL_RES(zv, zend_register_resource(ptr, rsrc_type));
+}
+
+#else
+/*== PHP 5 ===================================================================*/
+
+/* Used for destructors. */
+typedef zend_rsrc_list_entry zend_resource;
+
+static void compat_zend_delete_resource(const zval *zv TSRMLS_DC)
+{
+	if (IS_RESOURCE != Z_TYPE_P(zv)) {
+		return;
+	}
+
+	zend_list_delete(Z_LVAL_P(zv));
+}
+
+static void *compat_zend_fetch_resource(zval *zv, const char *rsrc_type_name, int rsrc_type TSRMLS_DC)
+{
+#if ZEND_MODULE_API_NO >= 20100412
+	return zend_fetch_resource(&zv TSRMLS_CC, -1, rsrc_type_name, NULL, 1, rsrc_type);
+#else
+	return zend_fetch_resource(&zv TSRMLS_CC, -1, (char *)rsrc_type_name, NULL, 1, rsrc_type);
+#endif
+}
+
+static void compat_zend_register_resource(zval *zv, void *ptr, int rsrc_type TSRMLS_DC)
+{
+	ZEND_REGISTER_RESOURCE(zv, ptr, rsrc_type);
+}
+
+#endif /* PHP_7 */
+/*============================================================================*/
+
+#endif /* _COMPAT_ZEND_RESOURCE_H */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_string.h php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_string.h
--- php-radius-1.2.7/radius-1.4.0b1/pecl-compat/src/zend_string.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/pecl-compat/src/zend_string.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,283 @@
+/*
+  +----------------------------------------------------------------------+
+  | zend_string compatibility layer for PHP 5 & 7                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2005-2007 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Francois Laupretre <francois@tekwire.net>                    |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef _COMPAT_ZEND_STRING_H
+#define _COMPAT_ZEND_STRING_H
+
+#ifdef PHP_7
+/*============================================================================*/
+#include "zend_string.h"
+
+#ifndef ZSTR_IS_PERSISTENT
+#	define ZSTR_IS_PERSISTENT(s) (GC_FLAGS(s) & IS_STR_PERSISTENT)
+#endif
+
+#else
+/*============================================================================*/
+/*---- zend_string for PHP 5 ----*/
+
+struct _zend_string {
+		int			persistent;
+		int			hash_is_set; /* needed because computed hash may be null */
+        zend_ulong	h; /* hash value */
+		uint32_t	refcount;
+        size_t		len;
+        char		val[1];
+};
+
+typedef struct _zend_string zend_string;
+
+/* Shortcuts */
+
+#define ZSTR_VAL(zstr)  (zstr)->val
+#define ZSTR_LEN(zstr)  (zstr)->len
+#define ZSTR_H(zstr)    (zstr)->h
+#define ZSTR_HASH(zstr) zend_string_hash_val(zstr)
+
+#define _ZSTR_HEADER_SIZE XtOffsetOf(zend_string, val)
+#define _ZSTR_STRUCT_SIZE(len) (_ZSTR_HEADER_SIZE + len + 1)
+
+#define ZSTR_IS_PERSISTENT(s) (s->persistent)
+
+/*---------*/
+
+static zend_always_inline uint32_t zend_string_refcount(zend_string *s)
+{
+	return (s->refcount);
+}
+
+/*---------*/
+
+static zend_always_inline uint32_t zend_string_addref(zend_string *s)
+{
+	return ++(s->refcount);
+}
+
+/*---------*/
+
+static zend_always_inline uint32_t zend_string_delref(zend_string *s)
+{
+	return --(s->refcount);
+}
+
+/*---------*/
+
+static zend_always_inline zend_ulong zend_string_hash_val(zend_string *s)
+{
+	char c, *p;
+
+	if (! s->hash_is_set) {
+		/* Compute with terminating null but preserve string */
+		p = &(ZSTR_VAL(s)[ZSTR_LEN(s)]);
+		c = (*p);
+		(*p) = '\0';
+		ZSTR_H(s) = zend_get_hash_value(ZSTR_VAL(s), ZSTR_LEN(s)+1);
+		(*p) = c;
+		s->hash_is_set = 1;
+	}
+	return ZSTR_H(s);
+}
+
+/*---------*/
+
+static zend_always_inline void zend_string_forget_hash_val(zend_string *s)
+{
+	s->hash_is_set = 0;
+	ZSTR_H(s) = 0; /* Security */
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_alloc(size_t len, int persistent)
+{
+	zend_string *ret = (zend_string *)pemalloc(ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(len)), persistent);
+	ret->persistent = persistent;
+	zend_string_forget_hash_val(ret);
+	ret->refcount = 1;
+	ZSTR_LEN(ret) = len;
+	return ret;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_safe_alloc(size_t n
+	, size_t m, size_t l, int persistent)
+{
+	zend_string *ret = (zend_string *)safe_pemalloc(n, m, ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(l)), persistent);
+	ret->persistent = persistent;
+	zend_string_forget_hash_val(ret);
+	ret->refcount = 1;
+	ZSTR_LEN(ret) = l;
+	return ret;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_init(const char *str, size_t len, int persistent)
+{
+	zend_string *ret = zend_string_alloc(len, persistent);
+
+	memcpy(ZSTR_VAL(ret), str, len);
+	ZSTR_VAL(ret)[len] = '\0';
+	return ret;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_dup(zend_string *s, int persistent)
+{
+	zend_string *target;
+
+	target = zend_string_init(ZSTR_VAL(s), ZSTR_LEN(s), persistent);
+	if (s->hash_is_set) {
+		ZSTR_H(target) = ZSTR_H(s);
+		target->hash_is_set = 1;
+	}
+
+	return target;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_realloc(zend_string *s
+	, size_t len, int persistent)
+{
+	zend_string *ret;
+
+	if (EXPECTED(s->refcount == 1)) {
+		ret = (zend_string *)perealloc(s, ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(len)), persistent);
+		ZSTR_LEN(ret) = len;
+		zend_string_forget_hash_val(ret);
+		return ret;
+	}
+
+	zend_string_delref(s);
+    ret = zend_string_alloc(len, persistent);
+    memcpy(ZSTR_VAL(ret), ZSTR_VAL(s), MIN(len, ZSTR_LEN(s)) + 1);
+
+	return ret;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_extend(zend_string *s
+	, size_t len, int persistent)
+{
+    zend_string *ret;
+
+    ZEND_ASSERT(len >= ZSTR_LEN(s));
+
+	if (EXPECTED(s->refcount == 1)) {
+		ret = (zend_string *)perealloc(s, ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(len)), persistent);
+		ZSTR_LEN(ret) = len;
+		zend_string_forget_hash_val(ret);
+		return ret;
+	}
+
+	zend_string_delref(s);
+    ret = zend_string_alloc(len, persistent);
+    memcpy(ZSTR_VAL(ret), ZSTR_VAL(s), ZSTR_LEN(s) + 1);
+
+    return ret;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_truncate(zend_string *s
+	, size_t len, int persistent)
+{
+    zend_string *ret;
+
+    ZEND_ASSERT(len <= ZSTR_LEN(s));
+
+	if (EXPECTED(s->refcount == 1)) {
+		ret = (zend_string *)perealloc(s, ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(len)), persistent);
+		ZSTR_LEN(ret) = len;
+		zend_string_forget_hash_val(ret);
+		return ret;
+	}
+
+	zend_string_delref(s);
+    ret = zend_string_alloc(len, persistent);
+    memcpy(ZSTR_VAL(ret), ZSTR_VAL(s), len + 1);
+
+    return ret;
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_safe_realloc(zend_string *s
+	, size_t n, size_t m, size_t l, int persistent)
+{
+    zend_string *ret;
+
+	if (EXPECTED(s->refcount == 1)) {
+		ret = (zend_string *)safe_perealloc(s, n, m, ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(l)), persistent);
+		ZSTR_LEN(ret) = (n * m) + l;
+		zend_string_forget_hash_val(ret);
+		return ret;
+	}
+
+	zend_string_delref(s);
+	ret = zend_string_safe_alloc(n, m, l, persistent);
+    memcpy(ZSTR_VAL(ret), ZSTR_VAL(s), MIN((n * m) + l, ZSTR_LEN(s)) + 1);
+    return ret;
+}
+
+/*---------*/
+
+static zend_always_inline void zend_string_free(zend_string *s)
+{
+	if (s) {
+		pefree(s, s->persistent);
+	}
+}
+
+
+/*---------*/
+
+static zend_always_inline void zend_string_release(zend_string *s)
+{
+	if (s) {
+		s->refcount--;
+		if (s->refcount == 0) {
+			zend_string_free(s);
+		}
+	}
+}
+
+/*---------*/
+
+static zend_always_inline zend_string *zend_string_copy(zend_string *s)
+{
+	zend_string_addref(s);
+	return (s);
+}
+
+/*---------*/
+
+static zend_always_inline zend_bool zend_string_equals(zend_string *s1, zend_string *s2)
+{
+	return s1 == s2 || (s1->len == s2->len && !memcmp(s1->val, s2->val, s1->len));
+}
+
+#define zend_string_equals_literal(str, literal) \
+	((str)->len == sizeof(literal)-1 && !memcmp((str)->val, literal, sizeof(literal) - 1))
+
+#endif /* PHP_7 */
+#endif /* _COMPAT_ZEND_STRING_H */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/php_radius.h php-radius-1.4.0~b1/radius-1.4.0b1/php_radius.h
--- php-radius-1.2.7/radius-1.4.0b1/php_radius.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/php_radius.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,110 @@
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+#include "radlib.h"
+#include "radlib_private.h"
+
+#ifndef PHP_RADIUS_H
+#define PHP_RADIUS_H
+
+#define phpext_radius_ptr &radius_module_entry
+
+#define PHP_RADIUS_VERSION "1.4.0b1"
+
+#ifdef PHP_WIN32
+#define PHP_RADIUS_API __declspec(dllexport)
+#else
+#define PHP_RADIUS_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+extern zend_module_entry radius_module_entry;
+
+PHP_MINIT_FUNCTION(radius);
+PHP_MSHUTDOWN_FUNCTION(radius);
+PHP_MINFO_FUNCTION(radius);
+
+PHP_FUNCTION(radius_auth_open);
+PHP_FUNCTION(radius_acct_open);
+PHP_FUNCTION(radius_close);
+PHP_FUNCTION(radius_strerror);
+PHP_FUNCTION(radius_config);
+PHP_FUNCTION(radius_add_server);
+PHP_FUNCTION(radius_create_request);
+PHP_FUNCTION(radius_put_string);
+PHP_FUNCTION(radius_put_int);
+PHP_FUNCTION(radius_put_attr);
+PHP_FUNCTION(radius_put_addr);
+PHP_FUNCTION(radius_put_vendor_string);
+PHP_FUNCTION(radius_put_vendor_int);
+PHP_FUNCTION(radius_put_vendor_attr);
+PHP_FUNCTION(radius_put_vendor_addr);
+PHP_FUNCTION(radius_send_request);
+PHP_FUNCTION(radius_get_attr);
+PHP_FUNCTION(radius_get_tagged_attr_data);
+PHP_FUNCTION(radius_get_tagged_attr_tag);
+PHP_FUNCTION(radius_get_vendor_attr);
+PHP_FUNCTION(radius_cvt_addr);
+PHP_FUNCTION(radius_cvt_int);
+PHP_FUNCTION(radius_cvt_string);
+PHP_FUNCTION(radius_salt_encrypt_attr);
+PHP_FUNCTION(radius_request_authenticator);
+PHP_FUNCTION(radius_server_secret);
+PHP_FUNCTION(radius_demangle);
+PHP_FUNCTION(radius_demangle_mppe_key);
+
+#ifdef ZTS
+#define RADIUS_G(v) TSRMG(radius_globals_id, zend_radius_globals *, v)
+#else
+#define RADIUS_G(v) (radius_globals.v)
+#endif
+
+#define RADIUS_OPTION_NONE	RAD_OPTION_NONE
+#define RADIUS_OPTION_TAGGED	RAD_OPTION_TAG
+#define RADIUS_OPTION_SALT	RAD_OPTION_SALT
+
+#endif	/* PHP_RADIUS_H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radius.c php-radius-1.4.0~b1/radius-1.4.0b1/radius.c
--- php-radius-1.2.7/radius-1.4.0b1/radius.c	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radius.c	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,862 @@
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_ini.h"
+#include "php_network.h"
+#include "ext/standard/info.h"
+#include "php_radius.h"
+#include "radlib.h"
+#include "radlib_private.h"
+
+#ifndef PHP_WIN32
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#include "pecl-compat/compat.h"
+
+void _radius_close(zend_resource *res TSRMLS_DC);
+
+static int _init_options(struct rad_attr_options *out, int options, int tag);
+
+#define RADIUS_FETCH_RESOURCE(radh, zv) \
+	radh = (struct rad_handle *)compat_zend_fetch_resource(zv, "rad_handle", le_radius TSRMLS_CC); \
+	if (!radh) { \
+		RETURN_FALSE; \
+	}
+
+/* If you declare any globals in php_radius.h uncomment this:
+ZEND_DECLARE_MODULE_GLOBALS(radius)
+*/
+
+/* True global resources - no need for thread safety here */
+static int le_radius;
+
+/* {{{ radius_functions[]
+ *
+ * Every user visible function must have an entry in radius_functions[].
+ */
+zend_function_entry radius_functions[] = {
+	PHP_FE(radius_auth_open,    NULL)
+	PHP_FE(radius_acct_open,    NULL)
+	PHP_FE(radius_close,        NULL)
+	PHP_FE(radius_strerror,     NULL)
+	PHP_FE(radius_config,       NULL)
+	PHP_FE(radius_add_server,	NULL)
+	PHP_FE(radius_create_request,	NULL)
+	PHP_FE(radius_put_string,	NULL)
+	PHP_FE(radius_put_int,	NULL)
+	PHP_FE(radius_put_attr,	NULL)
+	PHP_FE(radius_put_addr,	NULL)
+	PHP_FE(radius_put_vendor_string,	NULL)
+	PHP_FE(radius_put_vendor_int,	NULL)
+	PHP_FE(radius_put_vendor_attr,	NULL)
+	PHP_FE(radius_put_vendor_addr,	NULL)
+	PHP_FE(radius_send_request,	NULL)
+	PHP_FE(radius_get_attr,	NULL)
+	PHP_FE(radius_get_tagged_attr_data, NULL)
+	PHP_FE(radius_get_tagged_attr_tag, NULL)
+	PHP_FE(radius_get_vendor_attr,	NULL)
+	PHP_FE(radius_cvt_addr,	NULL)
+	PHP_FE(radius_cvt_int,	NULL)
+	PHP_FE(radius_cvt_string,	NULL)
+	PHP_FE(radius_salt_encrypt_attr,	NULL)
+	PHP_FE(radius_request_authenticator,	NULL)
+	PHP_FE(radius_server_secret,	NULL)
+	PHP_FE(radius_demangle,	NULL)    
+	PHP_FE(radius_demangle_mppe_key,	NULL)    
+	{NULL, NULL, NULL}	/* Must be the last line in radius_functions[] */
+};
+/* }}} */
+
+/* {{{ radius_module_entry
+ */
+zend_module_entry radius_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+	STANDARD_MODULE_HEADER,
+#endif
+	"radius",
+	radius_functions,
+	PHP_MINIT(radius),
+	PHP_MSHUTDOWN(radius),
+	NULL,
+	NULL,
+	PHP_MINFO(radius),
+#if ZEND_MODULE_API_NO >= 20010901
+	PHP_RADIUS_VERSION,
+#endif
+	STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
+#ifdef COMPILE_DL_RADIUS
+ZEND_GET_MODULE(radius)
+#endif
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(radius)
+{
+	le_radius = zend_register_list_destructors_ex(_radius_close, NULL, "rad_handle", module_number);
+#include "radius_init_const.h"
+	REGISTER_LONG_CONSTANT("RADIUS_MPPE_KEY_LEN", MPPE_KEY_LEN, CONST_PERSISTENT);    
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(radius)
+{
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(radius)
+{
+	php_info_print_table_start();
+	php_info_print_table_header(2, "radius support", "enabled");
+	php_info_print_table_row(2, "version", PHP_RADIUS_VERSION);
+	php_info_print_table_end();
+}
+/* }}} */
+
+/* {{{ proto resource radius_auth_open(string arg) */
+PHP_FUNCTION(radius_auth_open)
+{
+	struct rad_handle *radh = rad_auth_open();
+
+	if (radh != NULL) {
+		compat_zend_register_resource(return_value, radh, le_radius TSRMLS_CC);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto resource radius_acct_open(string arg) */
+PHP_FUNCTION(radius_acct_open)
+{
+	struct rad_handle *radh = rad_acct_open();
+
+	if (radh != NULL) {
+		compat_zend_register_resource(return_value, radh, le_radius TSRMLS_CC);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool radius_close(radh) */
+PHP_FUNCTION(radius_close)
+{
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
+		return;
+	}
+
+	/* Fetch the resource to verify it. */
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+	compat_zend_delete_resource(z_radh TSRMLS_CC);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string radius_strerror(radh) */
+PHP_FUNCTION(radius_strerror)
+{
+	char *msg;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+	msg = (char *)rad_strerror(radh);
+	RETURN_STRINGL(msg, strlen(msg));
+}
+/* }}} */
+
+/* {{{ proto bool radius_config(desc, configfile) */
+PHP_FUNCTION(radius_config)
+{
+	char *filename;
+	COMPAT_ARG_SIZE_T filename_len;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &filename, &filename_len) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (rad_config(radh, filename) == -1) {
+		RETURN_FALSE;
+	} else {
+		RETURN_TRUE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool radius_add_server(desc, hostname, port, secret, timeout, maxtries) */
+PHP_FUNCTION(radius_add_server)
+{
+	char *hostname, *secret;
+	COMPAT_ARG_SIZE_T hostname_len, secret_len;
+	long  port, timeout, maxtries;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rslsll", &z_radh,
+		&hostname, &hostname_len,
+		&port,
+		&secret, &secret_len,
+		&timeout, &maxtries) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (rad_add_server(radh, hostname, port, secret, timeout, maxtries) == -1) {
+		RETURN_FALSE;
+	} else {
+		RETURN_TRUE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool radius_create_request(desc, code) */
+PHP_FUNCTION(radius_create_request)
+{
+	long code;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &z_radh, &code) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (rad_create_request(radh, code) == -1) {
+		RETURN_FALSE;
+	} else {
+		RETURN_TRUE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_string(desc, type, str, options, tag) */
+PHP_FUNCTION(radius_put_string)
+{
+	char *str;
+	COMPAT_ARG_SIZE_T str_len;
+	long type, options = 0, tag = 0;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls|ll", &z_radh, &type, &str, &str_len, &options, &tag)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_string(radh, type, str, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_int(desc, type, int, options, tag) */
+PHP_FUNCTION(radius_put_int)
+{
+	long type, val, options = 0, tag = 0;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll|ll", &z_radh, &type, &val, &options, &tag)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_int(radh, type, val, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_attr(desc, type, data, options, tag) */
+PHP_FUNCTION(radius_put_attr)
+{
+	long type, options = 0, tag = 0;
+	COMPAT_ARG_SIZE_T len;
+	char *data;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls|ll", &z_radh, &type, &data, &len, &options, &tag)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_attr(radh, type, data, len, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_addr(desc, type, addr, options, tag) */
+PHP_FUNCTION(radius_put_addr)
+{
+	COMPAT_ARG_SIZE_T addrlen;
+	long type, options = 0, tag = 0;
+	char	*addr;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+	struct in_addr intern_addr;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls|ll", &z_radh, &type, &addr, &addrlen, &options, &tag)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (inet_aton(addr, &intern_addr) == 0) {
+		zend_error(E_ERROR, "Error converting Address");
+		RETURN_FALSE;
+	}
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_addr(radh, type, intern_addr, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_vendor_string(desc, vendor, type, str, options, tag) */
+PHP_FUNCTION(radius_put_vendor_string)
+{
+	char *str;
+	COMPAT_ARG_SIZE_T str_len;
+	long type, vendor, options = 0, tag = 0;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlls|ll", &z_radh, &vendor, &type, &str, &str_len, &options, &tag)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_vendor_string(radh, vendor, type, str, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_vendor_int(desc, vendor, type, int, options, tag) */
+PHP_FUNCTION(radius_put_vendor_int)
+{
+	long type, vendor, val, options = 0, tag = 0;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlll|ll", &z_radh, &vendor, &type, &val, &options, &tag)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_vendor_int(radh, vendor, type, val, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_vendor_attr(desc, vendor, type, data, options, tag) */
+PHP_FUNCTION(radius_put_vendor_attr)
+{
+	long type, vendor, options = 0, tag = 0;
+	COMPAT_ARG_SIZE_T len;
+	char *data;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlls|ll", &z_radh, &vendor, &type,
+		&data, &len, &options, &tag) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_vendor_attr(radh, vendor, type, data, len, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_put_vendor_addr(desc, vendor, type, addr) */
+PHP_FUNCTION(radius_put_vendor_addr)
+{
+	long type, vendor, options = 0, tag = 0;
+	COMPAT_ARG_SIZE_T addrlen;
+	char	*addr;
+	struct rad_attr_options attr_options;
+	struct rad_handle *radh;
+	zval *z_radh;
+	struct in_addr intern_addr;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlls|ll", &z_radh, &vendor,
+		&type, &addr, &addrlen, &options, &tag) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (inet_aton(addr, &intern_addr) == 0) {
+		zend_error(E_ERROR, "Error converting Address");
+		RETURN_FALSE;
+	}
+
+	if (_init_options(&attr_options, options, tag) == -1) {
+		RETURN_FALSE;
+	} else if (rad_put_vendor_addr(radh, vendor, type, intern_addr, &attr_options) == -1) {
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool radius_send_request(desc) */
+PHP_FUNCTION(radius_send_request)
+{
+	struct rad_handle *radh;
+	zval *z_radh;
+	int res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh)
+		== FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	res = rad_send_request(radh);
+	if (res == -1) {
+		RETURN_FALSE;
+	} else {
+		RETURN_LONG(res);
+	}
+}
+/* }}} */
+
+/* {{{ proto string radius_get_attr(desc) */
+PHP_FUNCTION(radius_get_attr)
+{
+	struct rad_handle *radh;
+	int res;
+	const void *data;
+	size_t len;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	res = rad_get_attr(radh, &data, &len);
+	if (res == -1) {
+		RETURN_FALSE;
+	} else {
+		if (res > 0) {
+
+			array_init(return_value);
+			add_assoc_long(return_value, "attr", res);
+			add_assoc_stringl(return_value, "data", (char *) data, len);
+			return;
+		}
+		RETURN_LONG(res);
+	}
+}
+/* }}} */
+
+/* {{{ proto string radius_get_tagged_attr_data(string attr) */
+PHP_FUNCTION(radius_get_tagged_attr_data)
+{
+	const char *attr;
+	COMPAT_ARG_SIZE_T len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &attr, &len) == FAILURE) {
+		return;
+	}
+
+	if (len < 1) {
+		zend_error(E_NOTICE, "Empty attributes cannot have tags");
+		RETURN_FALSE;
+	} else if (len == 1) {
+		RETURN_EMPTY_STRING();
+	}
+
+	RETURN_STRINGL(attr + 1, len - 1);
+}
+/* }}} */
+
+/* {{{ proto string radius_get_tagged_attr_tag(string attr) */
+PHP_FUNCTION(radius_get_tagged_attr_tag)
+{
+	const char *attr;
+	COMPAT_ARG_SIZE_T len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &attr, &len) == FAILURE) {
+		return;
+	}
+
+	if (len < 1) {
+		zend_error(E_NOTICE, "Empty attributes cannot have tags");
+		RETURN_FALSE;
+	}
+
+	RETURN_LONG((long) *attr);
+}
+/* }}} */
+
+/* {{{ proto string radius_get_vendor_attr(data) */
+PHP_FUNCTION(radius_get_vendor_attr)
+{
+	const void *data, *raw;
+	COMPAT_ARG_SIZE_T len;
+	u_int32_t vendor;
+	unsigned char type;
+	size_t data_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &raw, &len) == FAILURE) {
+		return;
+	}
+
+	if (rad_get_vendor_attr(&vendor, &type, &data, &data_len, raw, len) == -1) {
+		RETURN_FALSE;
+	} else {
+
+		array_init(return_value);
+		add_assoc_long(return_value, "attr", type);
+		add_assoc_long(return_value, "vendor", vendor);
+		add_assoc_stringl(return_value, "data", (char *) data, data_len);
+		return;
+	}
+}
+/* }}} */
+
+/* {{{ proto string radius_cvt_addr(data) */
+PHP_FUNCTION(radius_cvt_addr)
+{
+	const void *data;
+	char *addr_dot;
+	COMPAT_ARG_SIZE_T len;
+	struct in_addr addr;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &len) == FAILURE) {
+		return;
+	}
+
+	addr = rad_cvt_addr(data);
+	addr_dot = inet_ntoa(addr);
+	RETURN_STRINGL(addr_dot, strlen(addr_dot));
+}
+/* }}} */
+
+/* {{{ proto int radius_cvt_int(data) */
+PHP_FUNCTION(radius_cvt_int)
+{
+	const void *data;
+	COMPAT_ARG_SIZE_T len;
+	int val;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &len)
+		== FAILURE) {
+		return;
+	}
+
+	val = rad_cvt_int(data);
+	RETURN_LONG(val);
+}
+/* }}} */
+
+/* {{{ proto string radius_cvt_string(data) */
+PHP_FUNCTION(radius_cvt_string)
+{
+	const void *data;
+	char *val;
+	COMPAT_ARG_SIZE_T len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &len)
+		== FAILURE) {
+		return;
+	}
+
+	val = rad_cvt_string(data, len);
+	if (val == NULL) RETURN_FALSE;
+	RETVAL_STRINGL(val, strlen(val));
+	free(val);
+	return;
+}
+/* }}} */
+
+/* {{{ proto string radius_salt_encrypt_attr(resource radh, string data) */
+PHP_FUNCTION(radius_salt_encrypt_attr)
+{
+	char *data;
+	COMPAT_ARG_SIZE_T len;
+	struct rad_handle *radh;
+	struct rad_salted_value salted;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &data, &len) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	if (rad_salt_value(radh, data, len, &salted) == -1) {
+		zend_error(E_WARNING, "%s", rad_strerror(radh));
+		RETURN_FALSE;
+	} else if (salted.len == 0) {
+		RETURN_EMPTY_STRING();
+	}
+
+	RETVAL_STRINGL(salted.data, salted.len);
+	efree(salted.data);
+}
+/* }}} */
+
+/* {{{ proto string radius_request_authenticator(radh) */
+PHP_FUNCTION(radius_request_authenticator)
+{
+	struct rad_handle *radh;
+	ssize_t res;
+	char buf[LEN_AUTH];
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	res = rad_request_authenticator(radh, buf, sizeof buf);
+	if (res == -1) {
+		RETURN_FALSE;
+	} else {
+		RETURN_STRINGL(buf, res);
+	}
+}
+/* }}} */
+
+/* {{{ proto string radius_server_secret(radh) */
+PHP_FUNCTION(radius_server_secret)
+{
+	char *secret;
+	struct rad_handle *radh;
+	zval *z_radh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_radh) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+	secret = (char *)rad_server_secret(radh);
+
+	if (secret) {
+		RETURN_STRINGL(secret, strlen(secret));
+	}
+
+	RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto string radius_demangle(radh, mangled) */
+PHP_FUNCTION(radius_demangle)
+{
+	struct rad_handle *radh;
+	zval *z_radh;
+	const void *mangled;
+	unsigned char *buf;
+	COMPAT_ARG_SIZE_T len;
+	int res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &mangled, &len) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	buf = emalloc(len);
+	res = rad_demangle(radh, mangled, len, buf);
+
+	if (res == -1) {
+		efree(buf);
+		RETURN_FALSE;
+	} else {
+		RETVAL_STRINGL((char *) buf, len);
+		efree(buf);
+		return;
+	}
+}
+/* }}} */
+
+/* {{{ proto string radius_demangle_mppe_key(radh, mangled) */
+PHP_FUNCTION(radius_demangle_mppe_key)
+{
+	struct rad_handle *radh;
+	zval *z_radh;
+	const void *mangled;
+	unsigned char *buf;
+	size_t dlen;
+	COMPAT_ARG_SIZE_T len;
+	int res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_radh, &mangled, &len) == FAILURE) {
+		return;
+	}
+
+	RADIUS_FETCH_RESOURCE(radh, z_radh);
+
+	buf = emalloc(len);
+	res = rad_demangle_mppe_key(radh, mangled, len, buf, &dlen);
+	if (res == -1) {
+		efree(buf);
+		RETURN_FALSE;
+	} else {
+		RETVAL_STRINGL((char *) buf, dlen);
+		efree(buf);
+		return;
+	}
+}
+/* }}} */
+
+/* {{{ _init_options() */
+int _init_options(struct rad_attr_options *out, int options, int tag) {
+	memset(out, 0, sizeof(struct rad_attr_options));
+
+	if (options & RADIUS_OPTION_SALT) {
+		out->options |= RAD_OPTION_SALT;
+	}
+
+	if (options & RADIUS_OPTION_TAGGED) {
+		if (tag < 0 || tag > 255) {
+			zend_error(E_NOTICE, "Tag must be between 0 and 255");
+			return -1;
+		}
+
+		out->options |= RAD_OPTION_TAG;
+		out->tag = tag;
+	}
+
+	return 0;
+}
+/* }}} */
+
+/* {{{ _radius_close() */
+void _radius_close(zend_resource *res TSRMLS_DC)
+{
+	struct rad_handle *radh = (struct rad_handle *)res->ptr;
+	rad_close(radh);
+	res->ptr = NULL;
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=8 ts=8 fdm=marker
+ * vim<600: noet sw=8 ts=8
+ */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radius.conf php-radius-1.4.0~b1/radius-1.4.0b1/radius.conf
--- php-radius-1.2.7/radius-1.4.0b1/radius.conf	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radius.conf	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,11 @@
+# Service-type Server Shared-secret Timeout Retries
+#auth|acct host[:port] secret 3 3
+# A simple entry using all the defaults:
+#acct  radius1.domain.com  OurLittleSecret
+
+# A server still using the obsolete RADIUS port, with increased
+# timeout and maximum tries:
+#auth  auth.domain.com:1645  "I can't see you"  5  4
+
+# A server specified by its IP address:
+#auth  192.168.27.81  $X*#..38947ax-+=
\ No newline at end of file
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radius.dsp php-radius-1.4.0~b1/radius-1.4.0b1/radius.dsp
--- php-radius-1.2.7/radius-1.4.0b1/radius.dsp	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radius.dsp	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,145 @@
+# Microsoft Developer Studio Project File - Name="radius" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=radius - Win32 Debug_TS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "radius.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "radius.mak" CFG="radius - Win32 Debug_TS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "radius - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "radius - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "radius - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "radius___Win32_Debug_TS"
+# PROP BASE Intermediate_Dir "radius___Win32_Debug_TS"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "_MBCS" /D "_USRDLL" /D "RADIUS_EXPORTS" /D HAVE_SOCKETS=1 /D ZEND_DEBUG=0 /D "PHP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_SOCKETS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_RADIUS=1 /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0xc07 /d "_DEBUG"
+# ADD RSC /l 0xc07 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 php4ts_debug.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_radius.dll" /pdbtype:sept /libpath:"..\..\..\php4\Debug_TS"
+
+!ELSEIF  "$(CFG)" == "radius - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "radius___Win32_Release_TS"
+# PROP BASE Intermediate_Dir "radius___Win32_Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RADIUS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\\bindlib_w32" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_RADIUS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_RADIUS" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0xc07 /d "NDEBUG"
+# ADD RSC /l 0xc07 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 php4ts.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_radius.dll" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "radius - Win32 Debug_TS"
+# Name "radius - Win32 Release_TS"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\radius.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib_compat.c
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\php_radius.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\radius_init_const.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib_md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\radlib_vs.h
+# End Source File
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radius.dsw php-radius-1.4.0~b1/radius-1.4.0b1/radius.dsw
--- php-radius-1.2.7/radius-1.4.0b1/radius.dsw	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radius.dsw	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
+
+###############################################################################
+
+Project: "radius"=".\radius.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radius_init_const.h php-radius-1.4.0~b1/radius-1.4.0b1/radius_init_const.h
--- php-radius-1.2.7/radius-1.4.0b1/radius_init_const.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radius_init_const.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,193 @@
+REGISTER_LONG_CONSTANT("RADIUS_ACCESS_REQUEST", 1, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCESS_ACCEPT", 2, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCESS_REJECT", 3, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_REQUEST", 4, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_RESPONSE", 5, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCESS_CHALLENGE", 11, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_DISCONNECT_REQUEST", 40, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_DISCONNECT_ACK", 41, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_DISCONNECT_NAK", 42, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_COA_REQUEST", 43, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_COA_ACK", 44, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_COA_NAK", 45, CONST_PERSISTENT);
+
+REGISTER_LONG_CONSTANT("RADIUS_USER_NAME", 1, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_USER_PASSWORD", 2, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_CHAP_PASSWORD", 3, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_NAS_IP_ADDRESS", 4, CONST_PERSISTENT);	/* IP address */
+REGISTER_LONG_CONSTANT("RADIUS_NAS_PORT", 5, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_SERVICE_TYPE", 6, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_LOGIN", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_FRAMED", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_LOGIN", 3, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_FRAMED", 4, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_OUTBOUND", 5, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ADMINISTRATIVE", 6, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_NAS_PROMPT", 7, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_AUTHENTICATE_ONLY", 8, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_NAS_PROMPT", 9, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_PROTOCOL", 7, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_PPP", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_SLIP", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ARAP", 3, CONST_PERSISTENT);	/* Appletalk */
+	REGISTER_LONG_CONSTANT("RADIUS_GANDALF", 4, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_XYLOGICS", 5, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IP_ADDRESS", 8, CONST_PERSISTENT);	/* IP address */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IP_NETMASK", 9, CONST_PERSISTENT);	/* IP address */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_ROUTING", 10, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_FILTER_ID", 11, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_MTU", 12, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_COMPRESSION", 13, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_COMP_NONE", 0, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_COMP_VJ", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_COMP_IPXHDR", 2, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_IP_HOST", 14, CONST_PERSISTENT);	/* IP address */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_SERVICE", 15, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_TCP_PORT", 16, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_REPLY_MESSAGE", 18, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_NUMBER", 19, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_CALLBACK_ID", 20, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_ROUTE", 22, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPX_NETWORK", 23, CONST_PERSISTENT);	/* IP address */
+REGISTER_LONG_CONSTANT("RADIUS_STATE", 24, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_CLASS", 25, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_VENDOR_SPECIFIC", 26, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_SESSION_TIMEOUT", 27, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_IDLE_TIMEOUT", 28, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_TERMINATION_ACTION", 29, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_CALLED_STATION_ID", 30, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_CALLING_STATION_ID", 31, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_NAS_IDENTIFIER", 32, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_PROXY_STATE", 33, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_SERVICE", 34, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_NODE", 35, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_GROUP", 36, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_APPLETALK_LINK", 37, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_APPLETALK_NETWORK", 38, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_APPLETALK_ZONE", 39, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_CHAP_CHALLENGE", 60, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_NAS_PORT_TYPE", 61, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_ASYNC", 0, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_SYNC", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ISDN_SYNC", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ISDN_ASYNC_V120", 3, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ISDN_ASYNC_V110", 4, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_VIRTUAL", 5, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_PIAFS", 6, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_HDLC_CLEAR_CHANNEL", 7, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_X_25", 8, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_X_75", 9, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_G_3_FAX", 10, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_SDSL", 11, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ADSL_CAP", 12, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ADSL_DMT", 13, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_IDSL", 14, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ETHERNET", 15, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_XDSL", 16, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_CABLE", 17, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_WIRELESS_OTHER", 18, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_WIRELESS_IEEE_802_11", 19, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_PORT_LIMIT", 62, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_LAT_PORT", 63, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_CONNECT_INFO", 77, CONST_PERSISTENT);	/* String */
+
+REGISTER_LONG_CONSTANT("RADIUS_NAS_IPV6_ADDRESS", 95, CONST_PERSISTENT);		/* IPv6 address */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_INTERFACE_ID", 96, CONST_PERSISTENT);	/* 8 octets */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPV6_PREFIX", 97, CONST_PERSISTENT);		/* Octets */
+REGISTER_LONG_CONSTANT("RADIUS_LOGIN_IPV6_HOST", 98, CONST_PERSISTENT);		/* IPv6 address */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPV6_ROUTE", 99, CONST_PERSISTENT);		/* String */
+REGISTER_LONG_CONSTANT("RADIUS_FRAMED_IPV6_POOL", 100, CONST_PERSISTENT);		/* String */
+REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE", 101, CONST_PERSISTENT);			/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_RESIDUAL_SESSION_CONTEXT_REMOVED", 201, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_INVALID_EAP_PACKET", 202, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_UNSUPPORTED_ATTRIBUTE", 401, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_MISSING_ATTRIBUTE", 402, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_NAS_IDENTIFICATION_MISMATCH", 403, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_INVALID_REQUEST", 404, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_UNSUPPORTED_SERVICE", 405, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_UNSUPPORTED_EXCEPTION", 406, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_ADMINISTRATIVELY_PROHIBITED", 501, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_REQUEST_NOT_ROUTABLE", 502, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_SESSION_CONTEXT_NOT_FOUND", 503, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_SESSION_CONTEXT_NOT_REMOVABLE", 504, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_OTHER_PROXY_PROCESSING_ERROR", 505, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_RESOURCES_UNAVAILABLE", 506, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ERROR_CAUSE_REQUEST_INITIATED", 507, CONST_PERSISTENT);
+
+
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_STATUS_TYPE", 40, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_START", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_STOP", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_ON", 7, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_ACCOUNTING_OFF", 8, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_DELAY_TIME", 41, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_INPUT_OCTETS", 42, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_OUTPUT_OCTETS", 43, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_SESSION_ID", 44, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_AUTHENTIC", 45, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_AUTH_RADIUS", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_AUTH_LOCAL", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_AUTH_REMOTE", 3, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_SESSION_TIME", 46, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_INPUT_PACKETS", 47, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_OUTPUT_PACKETS", 48, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_TERMINATE_CAUSE", 49, CONST_PERSISTENT);	/* Integer */
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_USER_REQUEST", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_LOST_CARRIER", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_LOST_SERVICE", 3, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_IDLE_TIMEOUT", 4, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_SESSION_TIMEOUT", 5, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_ADMIN_RESET", 6, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_ADMIN_REBOOT", 7, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_ERROR", 8, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_NAS_ERROR", 9, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_NAS_REQUEST", 10, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_NAS_REBOOT", 11, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_UNNEEDED", 12, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_PREEMPTED", 13, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_PORT_SUSPENDED", 14, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_SERVICE_UNAVAILABLE", 15, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_CALLBACK", 16, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_USER_ERROR", 17, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_TERM_HOST_REQUEST", 18, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_MULTI_SESSION_ID", 50, CONST_PERSISTENT);	/* String */
+REGISTER_LONG_CONSTANT("RADIUS_ACCT_LINK_COUNT", 51, CONST_PERSISTENT);	/* Integer */
+REGISTER_LONG_CONSTANT("RADIUS_VENDOR_MICROSOFT", 311, CONST_PERSISTENT);		/* rfc2548 */
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_RESPONSE", 1, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_ERROR", 2, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_PW_1", 3, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_PW_2", 4, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_LM_ENC_PW", 5, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_NT_ENC_PW", 6, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY", 7, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES", 8, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_RAS_VENDOR", 9, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_DOMAIN", 10, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_CHALLENGE", 11, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP_MPPE_KEYS", 12, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_BAP_USAGE", 13, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD", 14, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_LINK_DROP_TIME_LIMIT", 15, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_SEND_KEY", 16, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_MPPE_RECV_KEY", 17, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_RAS_VERSION", 18, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_OLD_ARAP_PASSWORD", 19, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_NEW_ARAP_PASSWORD", 20, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON", 21, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_FILTER", 22, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ACCT_AUTH_TYPE", 23, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ACCT_EAP_TYPE", 24, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP2_RESPONSE", 25, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP2_SUCCESS", 26, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_CHAP2_PW", 27, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER", 28, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_SECONDARY_DNS_SERVER", 29, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_PRIMARY_NBNS_SERVER", 30, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_SECONDARY_NBNS_SERVER", 31, CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RADIUS_MICROSOFT_MS_ARAP_CHALLENGE", 33, CONST_PERSISTENT);
+
+REGISTER_LONG_CONSTANT("RADIUS_OPTION_NONE", RADIUS_OPTION_NONE, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_OPTION_TAGGED", RADIUS_OPTION_TAGGED, CONST_PERSISTENT);
+REGISTER_LONG_CONSTANT("RADIUS_OPTION_SALT", RADIUS_OPTION_SALT, CONST_PERSISTENT);
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib.c php-radius-1.4.0~b1/radius-1.4.0b1/radlib.c
--- php-radius-1.2.7/radius-1.4.0b1/radlib.c	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib.c	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,1345 @@
+/*-
+ * Copyright 1998 Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD: src/lib/libradius/radlib.c,v 1.4.2.3 2002/06/17 02:24:57 brian Exp $
+ */
+
+#include <sys/types.h>
+
+#ifndef PHP_WIN32
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#else
+#include <process.h>
+#include "win32/time.h"
+#endif
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef PHP_WIN32
+#include <unistd.h>
+#endif
+
+#include "radlib_compat.h"
+#include "radlib_md5.h"
+#include "radlib_private.h"
+
+static void	 clear_password(struct rad_handle *);
+static void	 generr(struct rad_handle *, const char *, ...)
+		    __printflike(2, 3);
+static void	 insert_scrambled_password(struct rad_handle *, int);
+static void	 insert_request_authenticator(struct rad_handle *, int);
+static int	 is_valid_response(struct rad_handle *, int,
+		    const struct sockaddr_in *);
+static int	 put_password_attr(struct rad_handle *, int,
+		    const void *, size_t,
+		    const struct rad_attr_options *);
+static int	 put_raw_attr(struct rad_handle *, int,
+		    const void *, size_t,
+		    const struct rad_attr_options *);
+static int	 split(char *, char *[], int, char *, size_t);
+
+static void
+clear_password(struct rad_handle *h)
+{
+	if (h->pass_len != 0) {
+		memset(h->pass, 0, h->pass_len);
+		h->pass_len = 0;
+	}
+	h->pass_pos = 0;
+}
+
+static void
+generr(struct rad_handle *h, const char *format, ...)
+{
+	va_list		 ap;
+
+	va_start(ap, format);
+	vsnprintf(h->errmsg, ERRSIZE, format, ap);
+	va_end(ap);
+}
+
+static void
+insert_scrambled_password(struct rad_handle *h, int srv)
+{
+	MD5_CTX ctx;
+	unsigned char md5[16];
+	const struct rad_server *srvp;
+	int padded_len;
+	int pos;
+
+	srvp = &h->servers[srv];
+	padded_len = h->pass_len == 0 ? 16 : (h->pass_len+15) & ~0xf;
+
+	memcpy(md5, &h->request[POS_AUTH], LEN_AUTH);
+	for (pos = 0;  pos < padded_len;  pos += 16) {
+		int i;
+
+		/* Calculate the new scrambler */
+		MD5Init(&ctx);
+		MD5Update(&ctx, srvp->secret, strlen(srvp->secret));
+		MD5Update(&ctx, md5, 16);
+		MD5Final(md5, &ctx);
+
+		/*
+		 * Mix in the current chunk of the password, and copy
+		 * the result into the right place in the request.  Also
+		 * modify the scrambler in place, since we will use this
+		 * in calculating the scrambler for next time.
+		 */
+		for (i = 0;  i < 16;  i++)
+			h->request[h->pass_pos + pos + i] =
+			    md5[i] ^= h->pass[pos + i];
+	}
+}
+
+static void
+insert_request_authenticator(struct rad_handle *h, int srv)
+{
+	MD5_CTX ctx;
+	const struct rad_server *srvp;
+
+	srvp = &h->servers[srv];
+
+	/* Create the request authenticator */
+	MD5Init(&ctx);
+	MD5Update(&ctx, &h->request[POS_CODE], POS_AUTH - POS_CODE);
+	MD5Update(&ctx, memset(&h->request[POS_AUTH], 0, LEN_AUTH), LEN_AUTH);
+	MD5Update(&ctx, &h->request[POS_ATTRS], h->req_len - POS_ATTRS);
+	MD5Update(&ctx, srvp->secret, strlen(srvp->secret));
+	MD5Final(&h->request[POS_AUTH], &ctx);
+}
+
+/*
+ * Return true if the current response is valid for a request to the
+ * specified server.
+ */
+static int
+is_valid_response(struct rad_handle *h, int srv,
+    const struct sockaddr_in *from)
+{
+	MD5_CTX ctx;
+	unsigned char md5[16];
+	const struct rad_server *srvp;
+	int len;
+
+	srvp = &h->servers[srv];
+
+	/* Check the source address */
+	if (from->sin_family != srvp->addr.sin_family ||
+	    from->sin_addr.s_addr != srvp->addr.sin_addr.s_addr ||
+	    from->sin_port != srvp->addr.sin_port)
+		return 0;
+
+	/* Check the message length */
+	if (h->resp_len < POS_ATTRS)
+		return 0;
+	len = h->response[POS_LENGTH] << 8 | h->response[POS_LENGTH+1];
+	if (len > h->resp_len)
+		return 0;
+
+	/* Check the response authenticator */
+	MD5Init(&ctx);
+	MD5Update(&ctx, &h->response[POS_CODE], POS_AUTH - POS_CODE);
+	MD5Update(&ctx, &h->request[POS_AUTH], LEN_AUTH);
+	MD5Update(&ctx, &h->response[POS_ATTRS], len - POS_ATTRS);
+	MD5Update(&ctx, srvp->secret, strlen(srvp->secret));
+	MD5Final(md5, &ctx);
+	if (memcmp(&h->response[POS_AUTH], md5, sizeof md5) != 0)
+		return 0;
+
+	return 1;
+}
+
+static int
+put_password_attr(struct rad_handle *h, int type, const void *value, size_t len, const struct rad_attr_options *options)
+{
+	int padded_len;
+	int pad_len;
+
+	if (options->options & RAD_OPTION_SALT) {
+		generr(h, "User-Password attributes cannot be salt-encrypted");
+		return -1;
+	}
+
+	if (options->options & RAD_OPTION_TAG) {
+		generr(h, "User-Password attributes cannot be tagged");
+		return -1;
+	}
+
+	if (h->pass_pos != 0) {
+		generr(h, "Multiple User-Password attributes specified");
+		return -1;
+	}
+	if (len > PASSSIZE)
+		len = PASSSIZE;
+	padded_len = len == 0 ? 16 : (len+15) & ~0xf;
+	pad_len = padded_len - len;
+
+	/*
+	 * Put in a place-holder attribute containing all zeros, and
+	 * remember where it is so we can fill it in later.
+	 */
+	clear_password(h);
+	put_raw_attr(h, type, h->pass, padded_len, options);
+	h->pass_pos = h->req_len - padded_len;
+
+	/* Save the cleartext password, padded as necessary */
+	memcpy(h->pass, value, len);
+	h->pass_len = len;
+	memset(h->pass + len, 0, pad_len);
+	return 0;
+}
+
+static int
+put_raw_attr(struct rad_handle *h, int type, const void *value, size_t len, const struct rad_attr_options *options)
+{
+	const void *actual_value = value;
+	size_t full_len = 2 + len;
+	int res = -1;
+	struct rad_salted_value *salted = NULL;
+
+	if (options->options & RAD_OPTION_SALT) {
+		salted = emalloc(sizeof(struct rad_salted_value));
+
+		if (rad_salt_value(h, value, len, salted) == -1) {
+			goto end;
+		} else {
+			actual_value = salted->data;
+			len = salted->len;
+			full_len = 2 + len;
+		}
+	}
+
+	if (options->options & RAD_OPTION_TAG) {
+		full_len++;
+	}
+
+	if (full_len > 255) {
+		generr(h, "Attribute too long");
+		goto end;
+	}
+	
+	if (h->req_len + full_len > MSGSIZE) {
+		generr(h, "Maximum message length exceeded");
+		goto end;
+	}
+	h->request[h->req_len++] = type;
+	h->request[h->req_len++] = full_len;
+
+	if (options->options & RAD_OPTION_TAG) {
+		h->request[h->req_len++] = options->tag;
+	}
+
+	memcpy(&h->request[h->req_len], actual_value, len);
+	h->req_len += len;
+	res = 0;
+
+end:
+	if (salted) {
+		efree(salted->data);
+		efree(salted);
+	}
+
+	return res;
+}
+
+int
+rad_add_server(struct rad_handle *h, const char *host, int port,
+    const char *secret, int timeout, int tries)
+{
+	struct rad_server *srvp;
+
+	if (h->num_servers >= MAXSERVERS) {
+		generr(h, "Too many RADIUS servers specified");
+		return -1;
+	}
+	srvp = &h->servers[h->num_servers];
+
+	memset(&srvp->addr, 0, sizeof srvp->addr);
+	srvp->addr.sin_family = AF_INET;
+	if (!inet_aton(host, &srvp->addr.sin_addr)) {
+		struct hostent *hent;
+
+		if ((hent = gethostbyname(host)) == NULL) {
+			generr(h, "%s: host not found", host);
+			return -1;
+		}
+		memcpy(&srvp->addr.sin_addr, hent->h_addr,
+		    sizeof srvp->addr.sin_addr);
+	}
+	if (port != 0)
+		srvp->addr.sin_port = htons((short) port);
+	else {
+		struct servent *sent;
+
+		if (h->type == RADIUS_AUTH)
+			srvp->addr.sin_port =
+			    (sent = getservbyname("radius", "udp")) != NULL ?
+				sent->s_port : htons(RADIUS_PORT);
+		else
+			srvp->addr.sin_port =
+			    (sent = getservbyname("radacct", "udp")) != NULL ?
+				sent->s_port : htons(RADACCT_PORT);
+	}
+	if ((srvp->secret = strdup(secret)) == NULL) {
+		generr(h, "Out of memory");
+		return -1;
+	}
+	srvp->timeout = timeout;
+	srvp->max_tries = tries;
+	srvp->num_tries = 0;
+	h->num_servers++;
+	return 0;
+}
+
+void
+rad_close(struct rad_handle *h)
+{
+	int srv;
+
+	if (h->fd != -1)
+		close(h->fd);
+	for (srv = 0;  srv < h->num_servers;  srv++) {
+		memset(h->servers[srv].secret, 0,
+		    strlen(h->servers[srv].secret));
+		free(h->servers[srv].secret);
+	}
+	clear_password(h);
+	free(h);
+}
+
+int
+rad_config(struct rad_handle *h, const char *path)
+{
+	FILE *fp;
+	char buf[MAXCONFLINE];
+	int linenum;
+	int retval;
+
+	if (path == NULL)
+		path = PATH_RADIUS_CONF;
+	if ((fp = fopen(path, "r")) == NULL) {
+		generr(h, "Cannot open \"%s\": %s", path, strerror(errno));
+		return -1;
+	}
+	retval = 0;
+	linenum = 0;
+	while (fgets(buf, sizeof buf, fp) != NULL) {
+		int len;
+		char *fields[5];
+		int nfields;
+		char msg[ERRSIZE];
+		char *type;
+		char *host, *res;
+		char *port_str;
+		char *secret;
+		char *timeout_str;
+		char *maxtries_str;
+		char *end;
+		char *wanttype;
+		unsigned long timeout;
+		unsigned long maxtries;
+		int port;
+		int i;
+
+		linenum++;
+		len = strlen(buf);
+		/* We know len > 0, else fgets would have returned NULL. */
+		if (buf[len - 1] != '\n' && !(buf[len - 2] != '\r' && buf[len - 1] != '\n')) {
+			if (len == sizeof buf - 1)
+				generr(h, "%s:%d: line too long", path,
+				    linenum);
+			else
+				generr(h, "%s:%d: missing newline", path,
+				    linenum);
+			retval = -1;
+			break;
+		}
+		buf[len - 1] = '\0';
+
+		/* Extract the fields from the line. */
+		nfields = split(buf, fields, 5, msg, sizeof msg);
+		if (nfields == -1) {
+			generr(h, "%s:%d: %s", path, linenum, msg);
+			retval = -1;
+			break;
+		}
+		if (nfields == 0)
+			continue;
+		/*
+		 * The first field should contain "auth" or "acct" for
+		 * authentication or accounting, respectively.  But older
+		 * versions of the file didn't have that field.  Default
+		 * it to "auth" for backward compatibility.
+		 */
+		if (strcmp(fields[0], "auth") != 0 &&
+		    strcmp(fields[0], "acct") != 0) {
+			if (nfields >= 5) {
+				generr(h, "%s:%d: invalid service type", path,
+				    linenum);
+				retval = -1;
+				break;
+			}
+			nfields++;
+			for (i = nfields;  --i > 0;  )
+				fields[i] = fields[i - 1];
+			fields[0] = "auth";
+		}
+		if (nfields < 3) {
+			generr(h, "%s:%d: missing shared secret", path,
+			    linenum);
+			retval = -1;
+			break;
+		}
+		type = fields[0];
+		host = fields[1];
+		secret = fields[2];
+		timeout_str = fields[3];
+		maxtries_str = fields[4];
+
+		/* Ignore the line if it is for the wrong service type. */
+		wanttype = h->type == RADIUS_AUTH ? "auth" : "acct";
+		if (strcmp(type, wanttype) != 0)
+			continue;
+
+		/* Parse and validate the fields. */
+		res = host;
+		host = strsep(&res, ":");
+		port_str = strsep(&res, ":");
+		if (port_str != NULL) {
+			port = strtoul(port_str, &end, 10);
+			if (*end != '\0') {
+				generr(h, "%s:%d: invalid port", path,
+				    linenum);
+				retval = -1;
+				break;
+			}
+		} else
+			port = 0;
+		if (timeout_str != NULL) {
+			timeout = strtoul(timeout_str, &end, 10);
+			if (*end != '\0') {
+				generr(h, "%s:%d: invalid timeout", path,
+				    linenum);
+				retval = -1;
+				break;
+			}
+		} else
+			timeout = TIMEOUT;
+		if (maxtries_str != NULL) {
+			maxtries = strtoul(maxtries_str, &end, 10);
+			if (*end != '\0') {
+				generr(h, "%s:%d: invalid maxtries", path,
+				    linenum);
+				retval = -1;
+				break;
+			}
+		} else
+			maxtries = MAXTRIES;
+
+		if (rad_add_server(h, host, port, secret, timeout, maxtries) ==
+		    -1) {
+			strcpy(msg, h->errmsg);
+			generr(h, "%s:%d: %s", path, linenum, msg);
+			retval = -1;
+			break;
+		}
+	}
+	/* Clear out the buffer to wipe a possible copy of a shared secret */
+	memset(buf, 0, sizeof buf);
+	fclose(fp);
+	return retval;
+}
+
+/*
+ * rad_init_send_request() must have previously been called.
+ * Returns:
+ *   0     The application should select on *fd with a timeout of tv before
+ *         calling rad_continue_send_request again.
+ *   < 0   Failure
+ *   > 0   Success
+ */
+int
+rad_continue_send_request(struct rad_handle *h, int selected, int *fd,
+                          struct timeval *tv)
+{
+	int n;
+
+	if (selected) {
+		struct sockaddr_in from;
+		int fromlen;
+
+		fromlen = sizeof from;
+		h->resp_len = recvfrom(h->fd, h->response,
+		    MSGSIZE, MSG_WAITALL, (struct sockaddr *)&from, &fromlen);
+		if (h->resp_len == -1) {
+#ifdef PHP_WIN32
+			generr(h, "recfrom: %d", WSAGetLastError());
+#else
+			generr(h, "recvfrom: %s", strerror(errno));
+#endif
+			return -1;
+		}
+		if (is_valid_response(h, h->srv, &from)) {
+			h->resp_len = h->response[POS_LENGTH] << 8 |
+			    h->response[POS_LENGTH+1];
+			h->resp_pos = POS_ATTRS;
+			return h->response[POS_CODE];
+		}
+	}
+
+	if (h->try == h->total_tries) {
+		generr(h, "No valid RADIUS responses received");
+		return -1;
+	}
+
+	/*
+         * Scan round-robin to the next server that has some
+         * tries left.  There is guaranteed to be one, or we
+         * would have exited this loop by now.
+	 */
+	while (h->servers[h->srv].num_tries >= h->servers[h->srv].max_tries)
+		if (++h->srv >= h->num_servers)
+			h->srv = 0;
+
+	if (h->request[POS_CODE] == RAD_ACCOUNTING_REQUEST
+	    || h->request[POS_CODE] == RAD_COA_REQUEST
+	    || h->request[POS_CODE] == RAD_COA_ACK
+	    || h->request[POS_CODE] == RAD_COA_NAK
+	    || h->request[POS_CODE] == RAD_DISCONNECT_REQUEST
+	    || h->request[POS_CODE] == RAD_DISCONNECT_ACK
+	    || h->request[POS_CODE] == RAD_DISCONNECT_NAK)
+		/* Insert the request authenticator into the request */
+		insert_request_authenticator(h, h->srv);
+	else
+		/* Insert the scrambled password into the request */
+		if (h->pass_pos != 0)
+			insert_scrambled_password(h, h->srv);
+
+	/* Send the request */
+	n = sendto(h->fd, h->request, h->req_len, 0,
+	    (const struct sockaddr *)&h->servers[h->srv].addr,
+	    sizeof h->servers[h->srv].addr);
+	if (n != h->req_len) {
+		if (n == -1)
+#ifdef PHP_WIN32
+			generr(h, "sendto: %d", WSAGetLastError());
+#else
+			generr(h, "sendto: %s", strerror(errno));
+#endif
+		else
+			generr(h, "sendto: short write");
+		return -1;
+	}
+
+	h->try++;
+	h->servers[h->srv].num_tries++;
+	tv->tv_sec = h->servers[h->srv].timeout;
+	tv->tv_usec = 0;
+	*fd = h->fd;
+
+	return 0;
+}
+
+int
+rad_create_request(struct rad_handle *h, int code)
+{
+	int i;
+
+	h->request[POS_CODE] = code;
+	h->request[POS_IDENT] = ++h->ident;
+	/* Create a random authenticator */
+	for (i = 0;  i < LEN_AUTH;  i += 2) {
+		long r;
+		TSRMLS_FETCH();
+		r = php_rand(TSRMLS_C);
+		h->request[POS_AUTH+i] = (unsigned char) r;
+		h->request[POS_AUTH+i+1] = (unsigned char) (r >> 8);
+	}
+	h->req_len = POS_ATTRS;
+	h->request_created = 1;    
+	clear_password(h);
+	return 0;
+}
+
+struct in_addr
+rad_cvt_addr(const void *data)
+{
+	struct in_addr value;
+
+	memcpy(&value.s_addr, data, sizeof value.s_addr);
+	return value;
+}
+
+u_int32_t
+rad_cvt_int(const void *data)
+{
+	u_int32_t value;
+
+	memcpy(&value, data, sizeof value);
+	return ntohl(value);
+}
+
+char *
+rad_cvt_string(const void *data, size_t len)
+{
+	char *s;
+
+	s = malloc(len + 1);
+	if (s != NULL) {
+		memcpy(s, data, len);
+		s[len] = '\0';
+	}
+	return s;
+}
+
+/*
+ * Returns the attribute type.  If none are left, returns 0.  On failure,
+ * returns -1.
+ */
+int
+rad_get_attr(struct rad_handle *h, const void **value, size_t *len)
+{
+	int type;
+
+	if (h->resp_len == 0) {
+		generr(h, "No response has been received");
+		return -1;
+	}
+	if (h->resp_pos >= h->resp_len)
+		return 0;
+	if (h->resp_pos + 2 > h->resp_len) {
+		generr(h, "Malformed attribute in response");
+		return -1;
+	}
+	type = h->response[h->resp_pos++];
+	*len = h->response[h->resp_pos++] - 2;
+	if (h->resp_pos + (int) *len > h->resp_len) {
+		generr(h, "Malformed attribute in response");
+		return -1;
+	}
+	*value = &h->response[h->resp_pos];
+	h->resp_pos += *len;
+	return type;
+}
+
+/*
+ * Returns -1 on error, 0 to indicate no event and >0 for success
+ */
+int
+rad_init_send_request(struct rad_handle *h, int *fd, struct timeval *tv)
+{
+	int srv;
+
+	/* Make sure we have a socket to use */
+	if (h->fd == -1) {
+		struct sockaddr_in sin;
+
+		if ((h->fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
+#ifdef PHP_WIN32
+			generr(h, "Cannot create socket: %d", WSAGetLastError());
+#else
+			generr(h, "Cannot create socket: %s", strerror(errno));
+#endif
+			return -1;
+		}
+		memset(&sin, 0, sizeof sin);
+		sin.sin_family = AF_INET;
+		sin.sin_addr.s_addr = INADDR_ANY;
+		sin.sin_port = htons(0);
+		if (bind(h->fd, (const struct sockaddr *)&sin,
+		    sizeof sin) == -1) {
+#ifdef PHP_WIN32
+			generr(h, "bind: %d", WSAGetLastError());
+#else
+			generr(h, "bind: %s", strerror(errno));
+#endif
+			close(h->fd);
+			h->fd = -1;
+			return -1;
+		}
+	}
+
+	if (h->request[POS_CODE] == RAD_ACCOUNTING_REQUEST
+	    || h->request[POS_CODE] == RAD_COA_REQUEST
+	    || h->request[POS_CODE] == RAD_COA_ACK
+	    || h->request[POS_CODE] == RAD_COA_NAK
+	    || h->request[POS_CODE] == RAD_DISCONNECT_REQUEST
+	    || h->request[POS_CODE] == RAD_DISCONNECT_ACK
+	    || h->request[POS_CODE] == RAD_DISCONNECT_NAK) {
+		/* Make sure no password given */
+		if (h->pass_pos || h->chap_pass) {
+			generr(h, "User or Chap Password in non-access request");
+			return -1;
+		}
+	} else {
+		/* Make sure the user gave us a password */
+		if (h->pass_pos == 0 && !h->chap_pass) {
+			generr(h, "No User or Chap Password attributes given");
+			return -1;
+		}
+		if (h->pass_pos != 0 && h->chap_pass) {
+			generr(h, "Both User and Chap Password attributes given");
+			return -1;
+		}
+	}
+
+	/* Fill in the length field in the message */
+	h->request[POS_LENGTH] = h->req_len >> 8;
+	h->request[POS_LENGTH+1] = h->req_len;
+
+	/*
+	 * Count the total number of tries we will make, and zero the
+	 * counter for each server.
+	 */
+	h->total_tries = 0;
+	for (srv = 0;  srv < h->num_servers;  srv++) {
+		h->total_tries += h->servers[srv].max_tries;
+		h->servers[srv].num_tries = 0;
+	}
+	if (h->total_tries == 0) {
+		generr(h, "No RADIUS servers specified");
+		return -1;
+	}
+
+	h->try = h->srv = 0;
+
+	return rad_continue_send_request(h, 0, fd, tv);
+}
+
+/*
+ * Create and initialize a rad_handle structure, and return it to the
+ * caller.  Can fail only if the necessary memory cannot be allocated.
+ * In that case, it returns NULL.
+ */
+struct rad_handle *
+rad_auth_open(void)
+{
+	struct rad_handle *h;
+
+	h = (struct rad_handle *)malloc(sizeof(struct rad_handle));
+	if (h != NULL) {
+		TSRMLS_FETCH();
+		php_srand(time(NULL) * getpid() * (unsigned long) (php_combined_lcg(TSRMLS_C) * 10000.0) TSRMLS_CC);
+		h->fd = -1;
+		h->num_servers = 0;
+		h->ident = php_rand(TSRMLS_C);
+		h->errmsg[0] = '\0';
+		memset(h->request, 0, sizeof h->request);
+		h->req_len = 0;
+		memset(h->pass, 0, sizeof h->pass);
+		h->pass_len = 0;
+		h->pass_pos = 0;
+		h->chap_pass = 0;
+		h->type = RADIUS_AUTH;
+		h->request_created = 0;        
+		h->resp_len = 0;
+		h->srv = 0;
+	}
+	return h;
+}
+
+struct rad_handle *
+rad_acct_open(void)
+{
+	struct rad_handle *h;
+
+	h = rad_open();
+	if (h != NULL)
+	        h->type = RADIUS_ACCT;
+	return h;
+}
+
+struct rad_handle *
+rad_open(void)
+{
+    return rad_auth_open();
+}
+
+int
+rad_put_addr(struct rad_handle *h, int type, struct in_addr addr, const struct rad_attr_options *options)
+{
+	return rad_put_attr(h, type, &addr.s_addr, sizeof addr.s_addr, options);
+}
+
+int
+rad_put_attr(struct rad_handle *h, int type, const void *value, size_t len, const struct rad_attr_options *options)
+{
+	int result;
+
+	if (!h->request_created) {
+		generr(h, "Please call rad_create_request()");
+		return -1;
+	}
+
+	if (type == RAD_USER_PASSWORD)
+		result = put_password_attr(h, type, value, len, options);
+	else {
+		result = put_raw_attr(h, type, value, len, options);
+		if (result == 0 && type == RAD_CHAP_PASSWORD)
+			h->chap_pass = 1;
+	}
+
+	return result;
+}
+
+int
+rad_put_int(struct rad_handle *h, int type, u_int32_t value, const struct rad_attr_options *options)
+{
+	u_int32_t nvalue;
+
+	nvalue = htonl(value);
+	return rad_put_attr(h, type, &nvalue, sizeof nvalue, options);
+}
+
+int
+rad_put_string(struct rad_handle *h, int type, const char *str, const struct rad_attr_options *options)
+{
+	return rad_put_attr(h, type, str, strlen(str), options);
+}
+
+/*
+ * Returns the response type code on success, or -1 on failure.
+ */
+int
+rad_send_request(struct rad_handle *h)
+{
+	struct timeval timelimit;
+	struct timeval tv;
+	int fd;
+	int n;
+
+	n = rad_init_send_request(h, &fd, &tv);
+
+	if (n != 0)
+		return n;
+
+	gettimeofday(&timelimit, NULL);
+	timeradd(&tv, &timelimit, &timelimit);
+
+	for ( ; ; ) {
+		fd_set readfds;
+
+		FD_ZERO(&readfds);
+		FD_SET(fd, &readfds);
+
+		n = select(fd + 1, &readfds, NULL, NULL, &tv);
+
+		if (n == -1) {
+			generr(h, "select: %s", strerror(errno));
+			return -1;
+		}
+
+		if (!FD_ISSET(fd, &readfds)) {
+			/* Compute a new timeout */
+			gettimeofday(&tv, NULL);
+			timersub(&timelimit, &tv, &tv);
+			if (tv.tv_sec > 0 || (tv.tv_sec == 0 && tv.tv_usec > 0))
+				/* Continue the select */
+				continue;
+		}
+
+		n = rad_continue_send_request(h, n, &fd, &tv);
+
+		if (n != 0)
+			return n;
+
+		gettimeofday(&timelimit, NULL);
+		timeradd(&tv, &timelimit, &timelimit);
+	}
+}
+
+const char *
+rad_strerror(struct rad_handle *h)
+{
+	return h->errmsg;
+}
+
+/*
+ * Destructively split a string into fields separated by white space.
+ * `#' at the beginning of a field begins a comment that extends to the
+ * end of the string.  Fields may be quoted with `"'.  Inside quoted
+ * strings, the backslash escapes `\"' and `\\' are honored.
+ *
+ * Pointers to up to the first maxfields fields are stored in the fields
+ * array.  Missing fields get NULL pointers.
+ *
+ * The return value is the actual number of fields parsed, and is always
+ * <= maxfields.
+ *
+ * On a syntax error, places a message in the msg string, and returns -1.
+ */
+static int
+split(char *str, char *fields[], int maxfields, char *msg, size_t msglen)
+{
+	char *p;
+	int i;
+	static const char ws[] = " \t";
+
+	for (i = 0;  i < maxfields;  i++)
+		fields[i] = NULL;
+	p = str;
+	i = 0;
+	while (*p != '\0') {
+		p += strspn(p, ws);
+		if (*p == '#' || *p == '\0')
+			break;
+		if (i >= maxfields) {
+			snprintf(msg, msglen, "line has too many fields");
+			return -1;
+		}
+		if (*p == '"') {
+			char *dst;
+
+			dst = ++p;
+			fields[i] = dst;
+			while (*p != '"') {
+				if (*p == '\\') {
+					p++;
+					if (*p != '"' && *p != '\\' &&
+					    *p != '\0') {
+						snprintf(msg, msglen,
+						    "invalid `\\' escape");
+						return -1;
+					}
+				}
+				if (*p == '\0') {
+					snprintf(msg, msglen,
+					    "unterminated quoted string");
+					return -1;
+				}
+				*dst++ = *p++;
+			}
+			*dst = '\0';
+			p++;
+			if (*fields[i] == '\0') {
+				snprintf(msg, msglen,
+				    "empty quoted string not permitted");
+				return -1;
+			}
+			if (*p != '\0' && strspn(p, ws) == 0) {
+				snprintf(msg, msglen, "quoted string not"
+				    " followed by white space");
+				return -1;
+			}
+		} else {
+			fields[i] = p;
+			p += strcspn(p, ws);
+			if (*p != '\0')
+				*p++ = '\0';
+		}
+		i++;
+	}
+	return i;
+}
+
+int
+rad_get_vendor_attr(u_int32_t *vendor, unsigned char *type, const void **data, size_t *len, const void *raw, size_t raw_len)
+{
+	struct vendor_attribute *attr;
+
+	if (raw_len < sizeof(struct vendor_attribute)) {
+		return -1;
+	}
+
+	attr = (struct vendor_attribute *) raw;
+	*vendor = ntohl(attr->vendor_value);
+	*type = attr->attrib_type;
+	*data = attr->attrib_data;
+	*len = attr->attrib_len - 2;
+
+	if ((attr->attrib_len + 4) > raw_len) {
+		return -1;
+	}
+
+	return (attr->attrib_type);
+}
+
+int
+rad_put_vendor_addr(struct rad_handle *h, int vendor, int type,
+    struct in_addr addr, const struct rad_attr_options *options)
+{
+	return (rad_put_vendor_attr(h, vendor, type, &addr.s_addr,
+	    sizeof addr.s_addr, options));
+}
+
+int
+rad_put_vendor_attr(struct rad_handle *h, int vendor, int type,
+    const void *value, size_t len, const struct rad_attr_options *options)
+{
+	const void *actual_value = value;
+	struct vendor_attribute *attr = NULL;
+	struct rad_attr_options generic_options;
+	int res = -1;
+	struct rad_salted_value *salted = NULL;
+	size_t va_len = len + 6;
+    
+	if (!h->request_created) {
+		generr(h, "Please call rad_create_request()");
+		return -1;
+	}
+
+	/* Initialise the options that will be passed through to
+	 * put_raw_attr(). */
+	generic_options.options = options->options;
+	generic_options.tag = 0;
+
+	/* Salting needs to be done on the vendor specific attribute. */
+	if (options->options & RAD_OPTION_SALT) {
+		generic_options.options &= ~RAD_OPTION_SALT;
+		salted = emalloc(sizeof(struct rad_salted_value));
+
+		if (rad_salt_value(h, value, len, salted) == -1) {
+			goto end;
+		} else {
+			actual_value = salted->data;
+			len = salted->len;
+			va_len = len + 6;
+		}
+	}
+
+	if (options->options & RAD_OPTION_TAG) {
+		va_len++;
+	}
+
+	/* OK, allocate and start building the attribute. */
+	attr = emalloc(va_len);
+	if (attr == NULL) {
+		generr(h, "malloc failure (%d bytes)", va_len);
+		goto end;
+	}
+
+	attr->vendor_value = htonl(vendor);
+	attr->attrib_type = type;
+	attr->attrib_len = va_len - 4;
+
+	/* Similarly, tagging needs to occur within the vendor specific
+	 * attribute, rather than the generic attribute. */
+	if (options->options & RAD_OPTION_TAG) {
+		generic_options.options &= ~RAD_OPTION_TAG;
+		attr->attrib_data[0] = options->tag;
+		memcpy(attr->attrib_data + 1, actual_value, len);
+	} else {
+		memcpy(attr->attrib_data, actual_value, len);
+	}
+
+	res = put_raw_attr(h, RAD_VENDOR_SPECIFIC, attr, va_len, &generic_options);
+	if (res == 0 && vendor == RAD_VENDOR_MICROSOFT
+	    && (type == RAD_MICROSOFT_MS_CHAP_RESPONSE
+	    || type == RAD_MICROSOFT_MS_CHAP2_RESPONSE)) {
+		h->chap_pass = 1;
+	}
+
+end:
+	if (attr) {
+		efree(attr);
+	}
+
+	if (salted) {
+		efree(salted->data);
+		efree(salted);
+	}
+
+	return res;
+}
+
+int
+rad_put_vendor_int(struct rad_handle *h, int vendor, int type, u_int32_t i, const struct rad_attr_options *options)
+{
+	u_int32_t value;
+
+	value = htonl(i);
+	return (rad_put_vendor_attr(h, vendor, type, &value, sizeof value, options));
+}
+
+int
+rad_put_vendor_string(struct rad_handle *h, int vendor, int type,
+    const char *str, const struct rad_attr_options *options)
+{
+	return (rad_put_vendor_attr(h, vendor, type, str, strlen(str), options));
+}
+
+ssize_t
+rad_request_authenticator(struct rad_handle *h, char *buf, size_t len)
+{
+	if (len < LEN_AUTH)
+		return (-1);
+	memcpy(buf, h->request + POS_AUTH, LEN_AUTH);
+	if (len > LEN_AUTH)
+		buf[LEN_AUTH] = '\0';
+	return (LEN_AUTH);
+}
+
+const char *
+rad_server_secret(struct rad_handle *h)
+{
+	if (h->srv >= h->num_servers) {
+		generr(h, "No RADIUS servers specified");
+		return NULL;
+	}
+
+	return (h->servers[h->srv].secret);
+}
+
+int
+rad_demangle(struct rad_handle *h, const void *mangled, size_t mlen, u_char *demangled) 
+{
+	char R[LEN_AUTH];
+	const char *S;
+	int i, Ppos;
+	MD5_CTX Context;
+	u_char b[16], *C;
+
+	if ((mlen % 16 != 0) || (mlen > 128)) {
+		generr(h, "Cannot interpret mangled data of length %ld", (u_long)mlen);
+		return -1;
+	}
+
+	C = (u_char *)mangled;
+
+	/* We need the shared secret as Salt */
+	S = rad_server_secret(h);
+
+	/* We need the request authenticator */
+	if (rad_request_authenticator(h, R, sizeof R) != LEN_AUTH) {
+		generr(h, "Cannot obtain the RADIUS request authenticator");
+                return -1;
+	}
+
+	MD5Init(&Context);
+	MD5Update(&Context, S, strlen(S));
+	MD5Update(&Context, R, LEN_AUTH);
+	MD5Final(b, &Context);
+	Ppos = 0;
+	while (mlen) {
+
+		mlen -= 16;
+		for (i = 0; i < 16; i++)
+			demangled[Ppos++] = C[i] ^ b[i];
+
+		if (mlen) {
+			MD5Init(&Context);
+			MD5Update(&Context, S, strlen(S));
+			MD5Update(&Context, C, 16);
+			MD5Final(b, &Context);
+		}
+
+		C += 16;
+	}
+
+	return 0;
+}
+
+int
+rad_demangle_mppe_key(struct rad_handle *h, const void *mangled, size_t mlen, u_char *demangled, size_t *len)
+{
+	char R[LEN_AUTH];    /* variable names as per rfc2548 */
+	const char *S;
+	u_char b[16];
+	const u_char *A, *C;
+	MD5_CTX Context;
+	int Slen, i, Clen, Ppos;
+	u_char *P;
+
+	if (mlen % 16 != SALT_LEN) {
+		generr(h, "Cannot interpret mangled data of length %ld", (u_long)mlen);
+		return -1;
+	}
+
+	/* We need the RADIUS Request-Authenticator */
+	if (rad_request_authenticator(h, R, sizeof R) != LEN_AUTH) {
+		generr(h, "Cannot obtain the RADIUS request authenticator");
+		return -1;
+	}
+
+	A = (const u_char *)mangled;      /* Salt comes first */
+	C = (const u_char *)mangled + SALT_LEN;  /* Then the ciphertext */
+	Clen = mlen - SALT_LEN;
+	S = rad_server_secret(h);    /* We need the RADIUS secret */
+	Slen = strlen(S);
+	P = alloca(Clen);        /* We derive our plaintext */
+
+	MD5Init(&Context);
+	MD5Update(&Context, S, Slen);
+	MD5Update(&Context, R, LEN_AUTH);
+	MD5Update(&Context, A, SALT_LEN);
+	MD5Final(b, &Context);
+	Ppos = 0;
+
+	while (Clen) {
+		Clen -= 16;
+
+		for (i = 0; i < 16; i++)
+		    P[Ppos++] = C[i] ^ b[i];
+
+		if (Clen) {
+			MD5Init(&Context);
+			MD5Update(&Context, S, Slen);
+			MD5Update(&Context, C, 16);
+			MD5Final(b, &Context);
+		}
+                
+		C += 16;
+	}
+
+	/*
+	* The resulting plain text consists of a one-byte length, the text and
+	* maybe some padding.
+	*/
+	*len = *P;
+	if (*len > mlen - 1) {
+		generr(h, "Mangled data seems to be garbage %d %d", *len, mlen-1);        
+		return -1;
+	}
+
+	if (*len > MPPE_KEY_LEN) {
+		generr(h, "Key to long (%d) for me max. %d", *len, MPPE_KEY_LEN);        
+		return -1;
+	}
+
+	memcpy(demangled, P + 1, *len);
+	return 0;
+}
+
+int rad_salt_value(struct rad_handle *h, const char *in, size_t len, struct rad_salted_value *out)
+{
+	char authenticator[16];
+	size_t i;
+	char intermediate[16];
+	const char *in_pos;
+	MD5_CTX md5;
+	char *out_pos;
+	php_uint32 random;
+	size_t salted_len;
+	const char *secret;
+	TSRMLS_FETCH();
+
+	if (len == 0) {
+		out->len = 0;
+		out->data = NULL;
+		return 0;
+	}
+
+	/* Calculate the padded salted value length. */
+	salted_len = len;
+	if ((salted_len & 0x0f) != 0) {
+		salted_len += 0x0f;
+		salted_len &= ~0x0f;
+	}
+
+	/* 250 because there's a five byte overhead: one byte for type, one for
+	 * length, two for the salt, and one for the encrypted value length,
+	 * and the maximum RADIUS attribute size is 255 bytes. */
+	if (salted_len > 250) {
+		generr(h, "Value is too long to be salt-encrypted");
+		return -1;
+	}
+
+	/* Actually allocate the buffer. */
+	out->len = salted_len + 3;
+	out->data = emalloc(out->len);
+
+	if (out->data == NULL) {
+		return -1;
+	}
+
+	memset(out->data, 0, out->len);
+
+	/* Grab the request authenticator. */
+	if (rad_request_authenticator(h, authenticator, sizeof authenticator) != sizeof authenticator) {
+		generr(h, "Cannot obtain the RADIUS request authenticator");
+		goto err;
+	}
+
+	/* Grab the server secret. */
+	secret = rad_server_secret(h);
+	if (secret == NULL) {
+		generr(h, "Cannot obtain the RADIUS server secret");
+		goto err;
+	}
+
+	/* Generate a random number to use as the salt. */
+	random = php_rand(TSRMLS_C);
+
+	/* The RFC requires that the high bit of the salt be 1. Otherwise,
+	 * let's set up the header. */
+	out->data[0] = (unsigned char) random | 0x80;
+	out->data[1] = (unsigned char) (random >> 8);
+	out->data[2] = (unsigned char) salted_len;
+
+	/* OK, let's get cracking on this. We have to calculate what the RFC
+	 * calls b1 first. */
+	MD5Init(&md5);
+	MD5Update(&md5, secret, strlen(secret));
+	MD5Update(&md5, authenticator, sizeof authenticator);
+	MD5Update(&md5, out->data, 2);
+	MD5Final(intermediate, &md5);
+
+	/* XOR the first chunk. */
+	in_pos = in - 1;
+	out_pos = out->data + 2;
+	for (i = 0; i < 16; i++) {
+		if (in_pos < (in + len)) {
+			*(++out_pos) = *(++in_pos) ^ intermediate[i];
+		} else {
+			*(++out_pos) = '\0' ^ intermediate[i];
+		}
+	}
+
+	/* Now walk over the rest of the input. */
+	while (in_pos < (in + len)) {
+		MD5Init(&md5);
+		MD5Update(&md5, secret, strlen(secret));
+		MD5Update(&md5, out_pos - 15, 16);
+		MD5Final(intermediate, &md5);
+
+		for (i = 0; i < 16; i++) {
+			if (in_pos < (in + len)) {
+				*(++out_pos) = *(++in_pos) ^ intermediate[i];
+			} else {
+				*(++out_pos) = '\0' ^ intermediate[i];
+			}
+		}
+	}
+
+	return 0;
+
+err:
+	efree(out->data);
+	out->data = NULL;
+	out->len = 0;
+
+	return -1;
+}
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib_compat.c php-radius-1.4.0~b1/radius-1.4.0b1/radlib_compat.c
--- php-radius-1.2.7/radius-1.4.0b1/radlib_compat.c	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib_compat.c	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+#include <stddef.h>
+#include "php.h"
+#include "time.h"
+
+int inet_aton(const char *cp, struct in_addr *inp) 
+{
+	inp->s_addr = inet_addr(cp);
+
+	if (inp->s_addr == INADDR_NONE) {
+		return 0;
+	}
+
+	return 1;
+}
+
+char *strsep(char **stringp,	const char *delim) 
+{
+	char *s;
+	const char *spanp;
+	int c, sc;
+	char *tok;
+
+	if ((s = *stringp) == NULL)
+		return (NULL);
+	for (tok = s;;) {
+		c = *s++;
+		spanp = delim;
+		do {
+			if ((sc = *spanp++) == c) {
+				if (c == 0)
+					s = NULL;
+				else
+					s[-1] = 0;
+				*stringp = s;
+				return (tok);
+			}
+		} while (sc != 0);
+	}
+	/* NOTREACHED */
+}
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib_compat.h php-radius-1.4.0~b1/radius-1.4.0b1/radlib_compat.h
--- php-radius-1.2.7/radius-1.4.0b1/radlib_compat.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib_compat.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+#ifndef _RADLIB_COMPAT_H_
+#define _RADLIB_COMPAT_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "ext/standard/php_rand.h"
+#include "ext/standard/php_standard.h"
+
+#define MPPE_KEY_LEN    16
+
+#ifndef HAVE_U_INT32_T
+typedef unsigned int u_int32_t;
+#endif
+
+#ifdef PHP_WIN32
+int inet_aton(const char *cp, struct in_addr *inp);
+char *strsep(char **stringp,	const char *delim);
+#define MSG_WAITALL 0
+#include "php_network.h"
+#endif
+
+#ifndef __printflike
+#define	__printflike(fmtarg, firstvararg)
+#endif
+
+#ifndef timeradd
+#define timeradd(tvp, uvp, vvp)		\
+	do {		\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;		\
+		if ((vvp)->tv_usec >= 1000000) {		\
+			(vvp)->tv_sec++;		\
+			(vvp)->tv_usec -= 1000000;		\
+		}		\
+	} while (0)
+#endif
+
+#ifndef timersub
+#define timersub(tvp, uvp, vvp)		\
+	do {		\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;		\
+		if ((vvp)->tv_usec < 0) {		\
+			(vvp)->tv_sec--;		\
+			(vvp)->tv_usec += 1000000;		\
+		}		\
+	} while (0)
+#endif
+
+#endif
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib.h php-radius-1.4.0~b1/radius-1.4.0b1/radlib.h
--- php-radius-1.2.7/radius-1.4.0b1/radlib.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,246 @@
+/*-
+ * Copyright 1998 Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD: src/lib/libradius/radlib.h,v 1.3.2.1 2002/06/17 02:24:57 brian Exp $
+ */
+
+#ifndef _RADLIB_H_
+#define _RADLIB_H_
+
+#ifndef PHP_WIN32
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
+#include "radlib_compat.h"
+
+/* Message types */
+#define RAD_ACCESS_REQUEST		1
+#define RAD_ACCESS_ACCEPT		2
+#define RAD_ACCESS_REJECT		3
+#define RAD_ACCOUNTING_REQUEST		4
+#define RAD_ACCOUNTING_RESPONSE		5
+#define RAD_ACCESS_CHALLENGE		11
+#define RAD_DISCONNECT_REQUEST		40
+#define RAD_DISCONNECT_ACK		41
+#define RAD_DISCONNECT_NAK		42
+#define RAD_COA_REQUEST			43
+#define RAD_COA_ACK			44
+#define RAD_COA_NAK			45
+
+/* Attribute types and values */
+#define RAD_USER_NAME			1	/* String */
+#define RAD_USER_PASSWORD		2	/* String */
+#define RAD_CHAP_PASSWORD		3	/* String */
+#define RAD_NAS_IP_ADDRESS		4	/* IP address */
+#define RAD_NAS_PORT			5	/* Integer */
+#define RAD_SERVICE_TYPE		6	/* Integer */
+	#define RAD_LOGIN			1
+	#define RAD_FRAMED			2
+	#define RAD_CALLBACK_LOGIN		3
+	#define RAD_CALLBACK_FRAMED		4
+	#define RAD_OUTBOUND			5
+	#define RAD_ADMINISTRATIVE		6
+	#define RAD_NAS_PROMPT			7
+	#define RAD_AUTHENTICATE_ONLY		8
+	#define RAD_CALLBACK_NAS_PROMPT		9
+#define RAD_FRAMED_PROTOCOL		7	/* Integer */
+	#define RAD_PPP				1
+	#define RAD_SLIP			2
+	#define RAD_ARAP			3	/* Appletalk */
+	#define RAD_GANDALF			4
+	#define RAD_XYLOGICS			5
+#define RAD_FRAMED_IP_ADDRESS		8	/* IP address */
+#define RAD_FRAMED_IP_NETMASK		9	/* IP address */
+#define RAD_FRAMED_ROUTING		10	/* Integer */
+#define RAD_FILTER_ID			11	/* String */
+#define RAD_FRAMED_MTU			12	/* Integer */
+#define RAD_FRAMED_COMPRESSION		13	/* Integer */
+	#define RAD_COMP_NONE			0
+	#define RAD_COMP_VJ			1
+	#define RAD_COMP_IPXHDR			2
+#define RAD_LOGIN_IP_HOST		14	/* IP address */
+#define RAD_LOGIN_SERVICE		15	/* Integer */
+#define RAD_LOGIN_TCP_PORT		16	/* Integer */
+	/* unassiged			17 */
+#define RAD_REPLY_MESSAGE		18	/* String */
+#define RAD_CALLBACK_NUMBER		19	/* String */
+#define RAD_CALLBACK_ID			20	/* String */
+	/* unassiged			21 */
+#define RAD_FRAMED_ROUTE		22	/* String */
+#define RAD_FRAMED_IPX_NETWORK		23	/* IP address */
+#define RAD_STATE			24	/* String */
+#define RAD_CLASS			25	/* Integer */
+#define RAD_VENDOR_SPECIFIC		26	/* Integer */
+#define RAD_SESSION_TIMEOUT		27	/* Integer */
+#define RAD_IDLE_TIMEOUT		28	/* Integer */
+#define RAD_TERMINATION_ACTION		29	/* Integer */
+#define RAD_CALLED_STATION_ID		30	/* String */
+#define RAD_CALLING_STATION_ID		31	/* String */
+#define RAD_NAS_IDENTIFIER		32	/* Integer */
+#define RAD_PROXY_STATE			33	/* Integer */
+#define RAD_LOGIN_LAT_SERVICE		34	/* Integer */
+#define RAD_LOGIN_LAT_NODE		35	/* Integer */
+#define RAD_LOGIN_LAT_GROUP		36	/* Integer */
+#define RAD_FRAMED_APPLETALK_LINK	37	/* Integer */
+#define RAD_FRAMED_APPLETALK_NETWORK	38	/* Integer */
+#define RAD_FRAMED_APPLETALK_ZONE	39	/* Integer */
+	/* reserved for accounting		40-59 */
+#define RAD_CHAP_CHALLENGE		60	/* String */
+#define RAD_NAS_PORT_TYPE		61	/* Integer */
+	#define RAD_ASYNC			0
+	#define RAD_SYNC			1
+	#define RAD_ISDN_SYNC			2
+	#define RAD_ISDN_ASYNC_V120		3
+	#define RAD_ISDN_ASYNC_V110		4
+	#define RAD_VIRTUAL			5
+	#define RAD_PIAFS			6
+	#define RAD_HDLC_CLEAR_CHANNEL		7
+	#define RAD_X_25			8
+	#define RAD_X_75			9
+	#define RAD_G_3_FAX			10
+	#define RAD_SDSL			11
+	#define RAD_ADSL_CAP			12
+	#define RAD_ADSL_DMT			13
+	#define RAD_IDSL			14
+	#define RAD_ETHERNET			15
+	#define RAD_XDSL			16
+	#define RAD_CABLE			17
+	#define RAD_WIRELESS_OTHER		18
+	#define RAD_WIRELESS_IEEE_802_11	19
+#define RAD_PORT_LIMIT			62	/* Integer */
+#define RAD_LOGIN_LAT_PORT		63	/* Integer */
+#define RAD_CONNECT_INFO		77	/* String */
+
+#define RAD_NAS_IPV6_ADDRESS		95      /* IPv6 address */
+#define RAD_FRAMED_INTERFACE_ID		96      /* 8 octets */
+#define RAD_FRAMED_IPV6_PREFIX		97      /* Octets */
+#define RAD_LOGIN_IPV6_HOST		98      /* IPv6 address */
+#define RAD_FRAMED_IPV6_ROUTE		99      /* String */
+#define RAD_FRAMED_IPV6_POOL		100     /* String */
+
+/* Accounting attribute types and values */
+#define RAD_ACCT_STATUS_TYPE		40	/* Integer */
+	#define RAD_START			1
+	#define RAD_STOP			2
+	#define RAD_ACCOUNTING_ON		7
+	#define RAD_ACCOUNTING_OFF		8
+#define RAD_ACCT_DELAY_TIME		41	/* Integer */
+#define RAD_ACCT_INPUT_OCTETS		42	/* Integer */
+#define RAD_ACCT_OUTPUT_OCTETS		43	/* Integer */
+#define RAD_ACCT_SESSION_ID		44	/* String */
+#define RAD_ACCT_AUTHENTIC		45	/* Integer */
+	#define RAD_AUTH_RADIUS			1
+	#define RAD_AUTH_LOCAL			2
+	#define RAD_AUTH_REMOTE			3
+#define RAD_ACCT_SESSION_TIME		46	/* Integer */
+#define RAD_ACCT_INPUT_PACKETS		47	/* Integer */
+#define RAD_ACCT_OUTPUT_PACKETS		48	/* Integer */
+#define RAD_ACCT_TERMINATE_CAUSE	49	/* Integer */
+	#define RAD_TERM_USER_REQUEST		1
+	#define RAD_TERM_LOST_CARRIER		2
+	#define RAD_TERM_LOST_SERVICE		3
+	#define RAD_TERM_IDLE_TIMEOUT		4
+	#define RAD_TERM_SESSION_TIMEOUT	5
+	#define RAD_TERM_ADMIN_RESET		6
+	#define RAD_TERM_ADMIN_REBOOT		7
+	#define RAD_TERM_PORT_ERROR		8
+	#define RAD_TERM_NAS_ERROR		9
+	#define RAD_TERM_NAS_REQUEST		10
+	#define RAD_TERM_NAS_REBOOT		11
+	#define RAD_TERM_PORT_UNNEEDED		12
+	#define RAD_TERM_PORT_PREEMPTED		13
+	#define RAD_TERM_PORT_SUSPENDED		14
+	#define RAD_TERM_SERVICE_UNAVAILABLE    15
+	#define RAD_TERM_CALLBACK		16
+	#define RAD_TERM_USER_ERROR		17
+	#define RAD_TERM_HOST_REQUEST		18
+#define	RAD_ACCT_MULTI_SESSION_ID	50	/* String */
+#define	RAD_ACCT_LINK_COUNT		51	/* Integer */
+
+/* Disconnect and CoA attributes */
+#define RAD_ERROR_CAUSE			101	/* Integer */
+	#define RAD_ERROR_CAUSE_RESIDUAL_SESSION_CONTEXT_REMOVED	201
+	#define RAD_ERROR_CAUSE_INVALID_EAP_PACKET			202
+	#define RAD_ERROR_CAUSE_UNSUPPORTED_ATTRIBUTE			401
+	#define RAD_ERROR_CAUSE_MISSING_ATTRIBUTE			402
+	#define RAD_ERROR_CAUSE_NAS_IDENTIFICATION_MISMATCH		403
+	#define RAD_ERROR_CAUSE_INVALID_REQUEST				404
+	#define RAD_ERROR_CAUSE_UNSUPPORTED_SERVICE			405
+	#define RAD_ERROR_CAUSE_UNSUPPORTED_EXCEPTION			406
+	#define RAD_ERROR_CAUSE_ADMINISTRATIVELY_PROHIBITED		501
+	#define RAD_ERROR_CAUSE_REQUEST_NOT_ROUTABLE			502
+	#define RAD_ERROR_CAUSE_SESSION_CONTEXT_NOT_FOUND		503
+	#define RAD_ERROR_CAUSE_SESSION_CONTEXT_NOT_REMOVABLE		504
+	#define RAD_ERROR_CAUSE_OTHER_PROXY_PROCESSING_ERROR		505
+	#define RAD_ERROR_CAUSE_RESOURCES_UNAVAILABLE			506
+	#define RAD_ERROR_CAUSE_REQUEST_INITIATED			507
+
+#define RAD_OPTION_NONE			0
+#define RAD_OPTION_TAG			(1 << 0)
+#define RAD_OPTION_SALT			(1 << 1)
+
+struct rad_handle;
+struct timeval;
+
+struct rad_attr_options {
+	int options;
+	unsigned char tag;
+};
+
+struct rad_salted_value {
+	size_t len;
+	char *data;
+};
+
+struct rad_handle	*rad_acct_open(void);
+int			 rad_add_server(struct rad_handle *, 
+				const char *, int, const char *, int, int);
+struct rad_handle	*rad_auth_open(void);
+void			 rad_close(struct rad_handle *);
+int			 rad_config(struct rad_handle *, const char *);
+int			 rad_continue_send_request(struct rad_handle *, 
+				int, int *, struct timeval *);
+int			 rad_create_request(struct rad_handle *, int);
+struct in_addr		 rad_cvt_addr(const void *);
+u_int32_t		 rad_cvt_int(const void *);
+char			*rad_cvt_string(const void *, size_t);
+int			 rad_get_attr(struct rad_handle *, const void **, size_t *);
+int			 rad_init_send_request(struct rad_handle *, int *, struct timeval *);
+struct rad_handle	*rad_open(void);  /* Deprecated, == rad_auth_open */
+int			 rad_put_addr(struct rad_handle *, int, struct in_addr, const struct rad_attr_options *);
+int			 rad_put_attr(struct rad_handle *, int, const void *, size_t, const struct rad_attr_options *);
+int			 rad_put_int(struct rad_handle *, int, u_int32_t, const struct rad_attr_options *);
+int			 rad_put_string(struct rad_handle *, int, const char *, const struct rad_attr_options *);
+ssize_t			 rad_request_authenticator(struct rad_handle *, char *, size_t);
+int			 rad_send_request(struct rad_handle *);
+const char		*rad_server_secret(struct rad_handle *);
+const char		*rad_strerror(struct rad_handle *);
+int			 rad_demangle(struct rad_handle *, const void *, size_t, u_char *);
+int	 		 rad_salt_value(struct rad_handle *, const char *, size_t, struct rad_salted_value *);
+
+#endif /* _RADLIB_H_ */
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib_md5.h php-radius-1.4.0~b1/radius-1.4.0b1/radlib_md5.h
--- php-radius-1.2.7/radius-1.4.0b1/radlib_md5.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib_md5.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+Copyright (c) 2003, Michael Bretterklieber <michael@bretterklieber.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This code cannot simply be copied and put under the GNU Public License or 
+any other GPL-like (LGPL, GPL2) License.
+
+    $Id$
+*/
+
+#include "php.h"
+#include "ext/standard/md5.h"
+
+#define MD5Init PHP_MD5Init
+#define MD5Update PHP_MD5Update
+#define MD5Final PHP_MD5Final
+#define MD5_CTX PHP_MD5_CTX
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib_private.h php-radius-1.4.0~b1/radius-1.4.0b1/radlib_private.h
--- php-radius-1.2.7/radius-1.4.0b1/radlib_private.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib_private.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,115 @@
+/*-
+ * Copyright 1998 Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD: src/lib/libradius/radlib_private.h,v 1.4.2.1 2002/06/17 02:24:57 brian Exp $
+ */
+
+#ifndef RADLIB_PRIVATE_H
+#define RADLIB_PRIVATE_H
+
+#include <sys/types.h>
+
+#ifndef PHP_WIN32
+#include <netinet/in.h>
+#endif
+
+#include "radlib_compat.h"
+#include "radlib.h"
+#include "radlib_vs.h"
+
+/* Handle types */
+#define RADIUS_AUTH		0   /* RADIUS authentication, default */
+#define RADIUS_ACCT		1   /* RADIUS accounting */
+
+/* Defaults */
+#define MAXTRIES		3
+#define PATH_RADIUS_CONF	"/etc/radius.conf"
+#define RADIUS_PORT		1812
+#define RADACCT_PORT		1813
+#define TIMEOUT			3	/* In seconds */
+
+/* Limits */
+#define ERRSIZE		128		/* Maximum error message length */
+#define MAXCONFLINE	1024		/* Maximum config file line length */
+#define MAXSERVERS	10		/* Maximum number of servers to try */
+#define MSGSIZE		4096		/* Maximum RADIUS message */
+#define PASSSIZE	128		/* Maximum significant password chars */
+
+/* Positions of fields in RADIUS messages */
+#define POS_CODE	0		/* Message code */
+#define POS_IDENT	1		/* Identifier */
+#define POS_LENGTH	2		/* Message length */
+#define POS_AUTH	4		/* Authenticator */
+#define LEN_AUTH	16		/* Length of authenticator */
+#define POS_ATTRS	20		/* Start of attributes */
+
+struct rad_server {
+	struct sockaddr_in addr;	/* Address of server */
+	char		*secret;	/* Shared secret */
+	int		 timeout;	/* Timeout in seconds */
+	int		 max_tries;	/* Number of tries before giving up */
+	int		 num_tries;	/* Number of tries so far */
+};
+
+struct rad_handle {
+	int		 fd;		/* Socket file descriptor */
+	struct rad_server servers[MAXSERVERS];	/* Servers to contact */
+	int		 num_servers;	/* Number of valid server entries */
+	int		 ident;		/* Current identifier value */
+	char		 errmsg[ERRSIZE];	/* Most recent error message */
+	unsigned char	 request[MSGSIZE];	/* Request to send */
+	char	 	 request_created;	/* rad_create_request() called? */        
+	int		 req_len;	/* Length of request */
+	char		 pass[PASSSIZE];	/* Cleartext password */
+	int		 pass_len;	/* Length of cleartext password */
+	int		 pass_pos;	/* Position of scrambled password */
+	char	 	 chap_pass;	/* Have we got a CHAP_PASSWORD ? */
+	unsigned char	 response[MSGSIZE];	/* Response received */
+	int		 resp_len;	/* Length of response */
+	int		 resp_pos;	/* Current position scanning attrs */
+	int		 total_tries;	/* How many requests we'll send */
+	int		 try;		/* How many requests we've sent */
+	int		 srv;		/* Server number we did last */
+	int		 type;		/* Handle type */
+};
+
+struct vendor_attribute {
+	u_int32_t vendor_value;
+	u_char attrib_type;
+	u_char attrib_len;
+	u_char attrib_data[1];
+};
+
+struct vendor_attribute_tag {
+	u_int32_t vendor_value;
+	u_char attrib_type;
+	u_char attrib_len;
+	u_char attrib_tag;
+	u_char attrib_data[1];
+};
+
+#endif
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/radlib_vs.h php-radius-1.4.0~b1/radius-1.4.0b1/radlib_vs.h
--- php-radius-1.2.7/radius-1.4.0b1/radlib_vs.h	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/radlib_vs.h	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,87 @@
+/*-
+ * Copyright (c) 2002-2003 Brian Somers <brian@Awfulhak.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/lib/libradius/radlib_vs.h,v 1.2.2.1 2002/06/17 02:24:57 brian Exp $
+ */
+
+#ifndef _RADLIB_VS_H_
+#define _RADLIB_VS_H_
+
+#include <sys/types.h>
+#ifndef PHP_WIN32
+#include <netinet/in.h>
+#endif
+
+#include "radlib_compat.h"
+
+#define	RAD_VENDOR_MICROSOFT	311		/* rfc2548 */
+	#define	RAD_MICROSOFT_MS_CHAP_RESPONSE			1
+	#define	RAD_MICROSOFT_MS_CHAP_ERROR			2
+	#define	RAD_MICROSOFT_MS_CHAP_PW_1			3
+	#define	RAD_MICROSOFT_MS_CHAP_PW_2			4
+	#define	RAD_MICROSOFT_MS_CHAP_LM_ENC_PW			5
+	#define	RAD_MICROSOFT_MS_CHAP_NT_ENC_PW			6
+	#define	RAD_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY		7
+	#define	RAD_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES		8
+	#define	RAD_MICROSOFT_MS_RAS_VENDOR			9
+	#define	RAD_MICROSOFT_MS_CHAP_DOMAIN			10
+	#define	RAD_MICROSOFT_MS_CHAP_CHALLENGE			11
+	#define	RAD_MICROSOFT_MS_CHAP_MPPE_KEYS			12
+	#define	RAD_MICROSOFT_MS_BAP_USAGE			13
+	#define	RAD_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD	14
+	#define	RAD_MICROSOFT_MS_LINK_DROP_TIME_LIMIT		15
+	#define	RAD_MICROSOFT_MS_MPPE_SEND_KEY			16
+	#define	RAD_MICROSOFT_MS_MPPE_RECV_KEY			17
+	#define	RAD_MICROSOFT_MS_RAS_VERSION			18
+	#define	RAD_MICROSOFT_MS_OLD_ARAP_PASSWORD		19
+	#define	RAD_MICROSOFT_MS_NEW_ARAP_PASSWORD		20
+	#define	RAD_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON	21
+	#define	RAD_MICROSOFT_MS_FILTER				22
+	#define	RAD_MICROSOFT_MS_ACCT_AUTH_TYPE			23
+	#define	RAD_MICROSOFT_MS_ACCT_EAP_TYPE			24
+	#define	RAD_MICROSOFT_MS_CHAP2_RESPONSE			25
+	#define	RAD_MICROSOFT_MS_CHAP2_SUCCESS			26
+	#define	RAD_MICROSOFT_MS_CHAP2_PW			27
+	#define	RAD_MICROSOFT_MS_PRIMARY_DNS_SERVER		28
+	#define	RAD_MICROSOFT_MS_SECONDARY_DNS_SERVER		29
+	#define	RAD_MICROSOFT_MS_PRIMARY_NBNS_SERVER		30
+	#define	RAD_MICROSOFT_MS_SECONDARY_NBNS_SERVER		31
+	#define	RAD_MICROSOFT_MS_ARAP_CHALLENGE			33
+
+#define SALT_LEN    2
+
+struct rad_attr_options;
+struct rad_handle;
+
+int	rad_get_vendor_attr(u_int32_t *, unsigned char *, const void **, size_t *, const void *, size_t);
+int	rad_put_vendor_addr(struct rad_handle *, int, int, struct in_addr, const struct rad_attr_options *);
+int	rad_put_vendor_attr(struct rad_handle *, int, int, const void *, size_t, const struct rad_attr_options *);
+int	rad_put_vendor_int(struct rad_handle *, int, int, u_int32_t, const struct rad_attr_options *);
+int	rad_put_vendor_string(struct rad_handle *, int, int, const char *, const struct rad_attr_options *);
+int	rad_demangle_mppe_key(struct rad_handle *, const void *, size_t, u_char *, size_t *);
+
+#endif /* _RADLIB_VS_H_ */
+
+/* vim: set ts=8 sw=8 noet: */
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/coa.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/coa.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/coa.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/coa.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,82 @@
+--TEST--
+RADIUS: RFC 3576 CoA message support
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_COA_REQUEST;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_FILTER_ID, 'filter'),
+);
+
+$server->addTransaction($request, $response);
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_COA_NAK, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_ERROR_CAUSE, pack('N', RADIUS_ERROR_CAUSE_MISSING_ATTRIBUTE)),
+));
+
+$server->addTransaction($request, $response);
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_COA_ACK, array(
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_COA_ACK;
+
+$server->addTransaction($request, $response);
+
+$server->handle();
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+
+var_dump(radius_send_request($res) == RADIUS_COA_REQUEST);
+var_dump(radius_get_attr($res));
+
+radius_create_request($res, RADIUS_COA_NAK);
+radius_put_int($res, RADIUS_ERROR_CAUSE, RADIUS_ERROR_CAUSE_MISSING_ATTRIBUTE);
+
+var_dump(radius_send_request($res) == RADIUS_COA_REQUEST);
+var_dump(radius_get_attr($res));
+
+radius_create_request($res, RADIUS_COA_ACK);
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(true)
+array(2) {
+  ["attr"]=>
+  int(11)
+  ["data"]=>
+  string(6) "filter"
+}
+bool(true)
+array(2) {
+  ["attr"]=>
+  int(11)
+  ["data"]=>
+  string(6) "filter"
+}
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/disconnect.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/disconnect.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/disconnect.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/disconnect.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,82 @@
+--TEST--
+RADIUS: RFC 3576 disconnect message support
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_DISCONNECT_REQUEST;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_NAS_IDENTIFIER, 'NAS'),
+);
+
+$server->addTransaction($request, $response);
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_DISCONNECT_NAK, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_ERROR_CAUSE, pack('N', RADIUS_ERROR_CAUSE_MISSING_ATTRIBUTE)),
+));
+
+$server->addTransaction($request, $response);
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_DISCONNECT_ACK, array(
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_DISCONNECT_ACK;
+
+$server->addTransaction($request, $response);
+
+$server->handle();
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+
+var_dump(radius_send_request($res) == RADIUS_DISCONNECT_REQUEST);
+var_dump(radius_get_attr($res));
+
+radius_create_request($res, RADIUS_DISCONNECT_NAK);
+radius_put_int($res, RADIUS_ERROR_CAUSE, RADIUS_ERROR_CAUSE_MISSING_ATTRIBUTE);
+
+var_dump(radius_send_request($res) == RADIUS_DISCONNECT_REQUEST);
+var_dump(radius_get_attr($res));
+
+radius_create_request($res, RADIUS_DISCONNECT_ACK);
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(true)
+array(2) {
+  ["attr"]=>
+  int(32)
+  ["data"]=>
+  string(3) "NAS"
+}
+bool(true)
+array(2) {
+  ["attr"]=>
+  int(32)
+  ["data"]=>
+  string(3) "NAS"
+}
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_acct_open.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_acct_open.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_acct_open.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_acct_open.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,16 @@
+--TEST--
+radius_acct_open()
+--INI--
+display_errors=1
+error_reporting=-1
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+$res = radius_acct_open();
+var_dump($res);
+?>
+--EXPECTF--
+resource(%d) of type (rad_handle)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_auth_open.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_auth_open.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_auth_open.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_auth_open.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,16 @@
+--TEST--
+radius_auth_open()
+--INI--
+display_errors=1
+error_reporting=-1
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+$res = radius_auth_open();
+var_dump($res);
+?>
+--EXPECTF--
+resource(%d) of type (rad_handle)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_close.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_close.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_close.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_close.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,23 @@
+--TEST--
+radius_close()
+--INI--
+display_errors=1
+error_reporting=-1
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+var_dump(radius_close(radius_acct_open()));
+var_dump(radius_close(radius_auth_open()));
+
+// The boolean cast is because PHP 4 will return NULL rather than false here.
+var_dump((boolean) radius_close(opendir('.')));
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+
+Warning: radius_close(): supplied resource is not a valid rad_handle resource in %s on line %d
+bool(false)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_cvt_addr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_cvt_addr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_cvt_addr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_cvt_addr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,15 @@
+--TEST--
+radius_cvt_addr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+var_dump(radius_cvt_addr(pack('N', ip2long('127.0.0.1'))));
+?>
+--EXPECT--
+string(9) "127.0.0.1"
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_cvt_int.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_cvt_int.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_cvt_int.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_cvt_int.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,15 @@
+--TEST--
+radius_cvt_int()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+var_dump(radius_cvt_int(pack('N', 1234)));
+?>
+--EXPECT--
+int(1234)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_cvt_string.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_cvt_string.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_cvt_string.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_cvt_string.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,15 @@
+--TEST--
+radius_cvt_string()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+var_dump(radius_cvt_string('127.0.0.1'));
+?>
+--EXPECT--
+string(9) "127.0.0.1"
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_attr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_attr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_attr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_attr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,54 @@
+--TEST--
+radius_get_attr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+
+var_dump(radius_get_attr($res));
+
+radius_send_request($res);
+
+var_dump(radius_get_attr($res));
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+array(2) {
+  ["attr"]=>
+  int(18)
+  ["data"]=>
+  string(7) "Go away"
+}
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_tagged_attr_data.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_tagged_attr_data.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_tagged_attr_data.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_tagged_attr_data.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,20 @@
+--TEST--
+radius_get_tagged_attr_data()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+var_dump(radius_get_tagged_attr_data(''));
+var_dump(radius_get_tagged_attr_data(pack('C', 20)));
+var_dump(radius_get_tagged_attr_data(pack('C', 20).'foo'));
+?>
+--EXPECTF--
+Notice: Empty attributes cannot have tags in %s on line %d
+bool(false)
+string(0) ""
+string(3) "foo"
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_tagged_attr_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_tagged_attr_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_tagged_attr_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_tagged_attr_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,20 @@
+--TEST--
+radius_get_tagged_attr_tag()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+var_dump(radius_get_tagged_attr_tag(''));
+var_dump(radius_get_tagged_attr_tag(pack('C', 20)));
+var_dump(radius_get_tagged_attr_tag(pack('C', 20).'foo'));
+?>
+--EXPECTF--
+Notice: Empty attributes cannot have tags in %s on line %d
+bool(false)
+int(20)
+int(20)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_vendor_attr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_vendor_attr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_get_vendor_attr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_get_vendor_attr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,33 @@
+--TEST--
+radius_get_vendor_attr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+var_dump(radius_get_vendor_attr(''));
+
+// Test with an incorrect length.
+$data = 'foo';
+var_dump(radius_get_vendor_attr(pack('NCC', RADIUS_VENDOR_MICROSOFT, 1, strlen($data) + 3).$data));
+
+$data = 'foo';
+var_dump(radius_get_vendor_attr(pack('NCC', RADIUS_VENDOR_MICROSOFT, 1, strlen($data) + 2).$data));
+?>
+--EXPECT--
+bool(false)
+bool(false)
+array(3) {
+  ["attr"]=>
+  int(1)
+  ["vendor"]=>
+  int(311)
+  ["data"]=>
+  string(3) "foo"
+}
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_addr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_addr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_addr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_addr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,53 @@
+--TEST--
+radius_put_addr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_NAS_IP_ADDRESS, pack('N', ip2long('127.0.0.1'))),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_IP_HOST, pack('N', ip2long('0.0.0.0')), null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1'));
+var_dump(radius_put_addr($res, RADIUS_LOGIN_IP_HOST, '0.0.0.0', RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1'));
+var_dump(radius_put_addr($res, RADIUS_LOGIN_IP_HOST, '0.0.0.0', RADIUS_OPTION_SALT));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_addr_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_addr_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_addr_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_addr_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,60 @@
+--TEST--
+radius_put_addr() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_NAS_IP_ADDRESS, pack('N', ip2long('127.0.0.1')), 10),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_IP_HOST, pack('N', ip2long('0.0.0.0')), 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1', RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1', RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_addr($res, RADIUS_LOGIN_IP_HOST, '0.0.0.0', RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_addr($res, RADIUS_NAS_IP_ADDRESS, '127.0.0.1', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_addr($res, RADIUS_LOGIN_IP_HOST, '0.0.0.0', RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_attr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_attr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_attr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_attr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,51 @@
+--TEST--
+radius_put_attr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_IP_HOST, 'bar', null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo'));
+var_dump(radius_put_attr($res, RADIUS_LOGIN_IP_HOST, 'bar', RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo'));
+var_dump(radius_put_attr($res, RADIUS_LOGIN_IP_HOST, 'bar', RADIUS_OPTION_SALT));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_attr_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_attr_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_attr_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_attr_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,58 @@
+--TEST--
+radius_put_attr() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo', 10),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_IP_HOST, 'bar', 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_attr($res, RADIUS_LOGIN_IP_HOST, 'bar', RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_attr($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_attr($res, RADIUS_LOGIN_IP_HOST, 'bar', RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_int.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_int.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_int.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_int.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,53 @@
+--TEST--
+radius_put_int()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_NAS_PORT, pack('N', 1234)),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_TCP_PORT, pack('N', 2345), null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234));
+var_dump(radius_put_int($res, RADIUS_LOGIN_TCP_PORT, 2345, RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234));
+var_dump(radius_put_int($res, RADIUS_LOGIN_TCP_PORT, 2345, RADIUS_OPTION_SALT));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_int_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_int_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_int_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_int_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,60 @@
+--TEST--
+radius_put_int() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_NAS_PORT, pack('N', 1234), 10),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_TCP_PORT, pack('N', 2345), 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234, RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234, RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234, RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_int($res, RADIUS_LOGIN_TCP_PORT, 2345, RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_int($res, RADIUS_NAS_PORT, 1234, RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_int($res, RADIUS_LOGIN_TCP_PORT, 2345, RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_string.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_string.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_string.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_string.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,51 @@
+--TEST--
+radius_put_string()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_IP_HOST, 'abcdefghijklmnopqrstuvwxyz', null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo'));
+var_dump(radius_put_string($res, RADIUS_LOGIN_IP_HOST, 'abcdefghijklmnopqrstuvwxyz', RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo'));
+var_dump(radius_put_string($res, RADIUS_LOGIN_IP_HOST, 'abcdefghijklmnopqrstuvwxyz', RADIUS_OPTION_SALT));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_string_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_string_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_string_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_string_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,58 @@
+--TEST--
+radius_put_string() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo', 10),
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_LOGIN_IP_HOST, 'abcdefghijklmnopqrstuvwxyz', 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_string($res, RADIUS_LOGIN_IP_HOST, 'abcdefghijklmnopqrstuvwxyz', RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_string($res, RADIUS_USER_NAME, 'foo', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_string($res, RADIUS_LOGIN_IP_HOST, 'abcdefghijklmnopqrstuvwxyz', RADIUS_OPTION_SALT | RADIUS_OPTION_TAGGED, 10));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_addr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_addr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_addr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_addr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,53 @@
+--TEST--
+radius_put_vendor_addr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, pack('N', ip2long('127.0.0.1'))),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, pack('N', ip2long('127.0.0.1')), null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1'));
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1'));
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_SALT));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_addr_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_addr_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_addr_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_addr_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,60 @@
+--TEST--
+radius_put_vendor_addr() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, pack('N', ip2long('127.0.0.1')), 10),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, pack('N', ip2long('127.0.0.1')), 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_addr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, '127.0.0.1', RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_attr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_attr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_attr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_attr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,51 @@
+--TEST--
+radius_put_vendor_attr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor'),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', null, 10),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor'));
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor'));
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_SALT));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_attr_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_attr_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_attr_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_attr_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,58 @@
+--TEST--
+radius_put_vendor_attr() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', 10),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, 'vendor', 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, 'foo', RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER, 'foo', RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_int.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_int.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_int.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_int.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,53 @@
+--TEST--
+radius_put_vendor_int()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, pack('N', 1234)),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, pack('N', 1234), null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234));
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234));
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_SALT));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_int_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_int_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_int_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_int_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,60 @@
+--TEST--
+radius_put_vendor_int() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_USER_NAME, 'foo'),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, pack('N', 1234), 10),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, pack('N', 1234), 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+radius_put_string($res, RADIUS_USER_NAME, 'foo');
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_int($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VERSION, 1234, RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_string.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_string.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_string.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_string.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,51 @@
+--TEST--
+radius_put_vendor_string()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor'),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', null, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor'));
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_SALT));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor'));
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_SALT));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_string_tag.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_string_tag.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_put_vendor_string_tag.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_put_vendor_string_tag.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,58 @@
+--TEST--
+radius_put_vendor_string() with tag
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+if (\RADIUS\FakeServer\FakeServer::skip()) {
+    die('SKIP: pcntl, radius and sockets extensions required');
+}
+?>
+--FILE--
+<?php
+include dirname(__FILE__).'/server/fake_server.php';
+
+$server = new \RADIUS\FakeServer\FakeServer;
+$res = $server->getAuthResource();
+
+$request = \RADIUS\FakeServer\Request::expect(RADIUS_ACCESS_REQUEST, array(
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', 10),
+    \RADIUS\FakeServer\VendorSpecificAttribute\expect(RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', 10, true),
+));
+
+$response = new \RADIUS\FakeServer\RadiusResponse;
+$response->code = RADIUS_ACCESS_REJECT;
+$response->attributes = array(
+    \RADIUS\FakeServer\Attribute\expect(RADIUS_REPLY_MESSAGE, 'Go away'),
+);
+
+$server->addTransaction($request, $response);
+$server->handle();
+
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, -1));
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, 256));
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+
+radius_create_request($res, RADIUS_ACCESS_REQUEST);
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_TAGGED, 10));
+var_dump(radius_put_vendor_string($res, RADIUS_VENDOR_MICROSOFT, RADIUS_MICROSOFT_MS_RAS_VENDOR, 'vendor', RADIUS_OPTION_SALT|RADIUS_OPTION_TAGGED, 10));
+radius_put_string($res, RADIUS_USER_PASSWORD, 'bar');
+radius_send_request($res);
+
+var_dump($server->wait());
+?>
+--EXPECTF--
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+
+Notice: Tag must be between 0 and 255 in %s on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+int(0)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_request_authenticator.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_request_authenticator.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_request_authenticator.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_request_authenticator.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,16 @@
+--TEST--
+radius_request_authenticator()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+$res = radius_acct_open();
+var_dump(radius_request_authenticator($res));
+?>
+--EXPECTF--
+string(16) "%s"
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_salt_encrypt_attr.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_salt_encrypt_attr.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_salt_encrypt_attr.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_salt_encrypt_attr.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,74 @@
+--TEST--
+radius_salt_encrypt_attr()
+--INI--
+display_errors=1
+error_reporting=22527
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+if (version_compare(PHP_VERSION, '5.0.0', '<')) echo 'SKIP: PHP 5 required';
+?>
+--FILE--
+<?php
+function salt_encrypt($value, $res, $salt) {
+    if ($value == '') {
+        return '';
+    }
+
+    $block = md5(radius_server_secret($res).radius_request_authenticator($res).substr($salt, 0, 2), true);
+    $output = '';
+
+    for ($i = 0; $i < 16; $i++) {
+        if (strlen($value)) {
+            $output .= chr(ord($value[0]) ^ ord($block[$i]));
+            $value = substr($value, 1);
+        } else {
+            $output .= chr(0 ^ ord($block[$i]));
+        }
+    }
+
+    while (strlen($value)) {
+        $block = md5(radius_server_secret($res).substr($output, -16), true);
+
+        for ($i = 0; $i < 16; $i++) {
+            if (strlen($value)) {
+                $output .= chr(ord($value[0]) ^ ord($block[$i]));
+                $value = substr($value, 1);
+            } else {
+                $output .= chr(0 ^ ord($block[$i]));
+            }
+        }
+    }
+
+    if (strlen($output) % 16 != 0) {
+        $output = str_pad($output, 16 * ceil(strlen($output) / 16), "\0");
+    }
+
+    return substr($salt, 0, 2).chr(strlen($output)).$output;
+}
+
+$res = radius_acct_open();
+
+var_dump(radius_salt_encrypt_attr($res, ''));
+var_dump(radius_salt_encrypt_attr($res, 'foo'));
+
+radius_add_server($res, 'localhost', 1234, 'a shared secret', 5, 3);
+
+var_dump(radius_salt_encrypt_attr($res, ''));
+
+$input = 'foo';
+$salted = radius_salt_encrypt_attr($res, $input);
+var_dump(salt_encrypt($input, $res, $salted) == $salted);
+
+$input = implode('', range('a', 'z'));
+$salted = radius_salt_encrypt_attr($res, $input);
+var_dump(salt_encrypt($input, $res, $salted) == $salted);
+?>
+--EXPECTF--
+string(0) ""
+
+Warning: Cannot obtain the RADIUS server secret in %s on line %f
+bool(false)
+string(0) ""
+bool(true)
+bool(true)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_server_secret_config.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_server_secret_config.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_server_secret_config.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_server_secret_config.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,40 @@
+--TEST--
+radius_server_secret(): load from configuration file
+--INI--
+display_errors=1
+error_reporting=-1
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+$file = dirname(__FILE__).'/radius_server_secret.conf';
+$fp = fopen($file, 'w');
+fwrite($fp, 'acct localhost "a shared secret"'."\n");
+fclose($fp);
+
+$res = radius_acct_open();
+radius_config($res, $file);
+var_dump(radius_server_secret($res));
+radius_close($res);
+
+$file = dirname(__FILE__).'/radius_server_secret.conf';
+$fp = fopen($file, 'w');
+fwrite($fp, 'acct what.is.hopefully.a.nonexistent.domain "a shared secret"');
+fclose($fp);
+
+// This shouldn't create a server, but crashed before 8f1de6f.
+$res = radius_acct_open();
+radius_config($res, $file);
+var_dump(radius_server_secret($res));
+radius_close($res);
+?>
+--CLEAN--
+<?php
+$file = dirname(__FILE__).'/radius_server_secret.conf';
+@unlink($file);
+?>
+--EXPECTF--
+string(15) "a shared secret"
+bool(false)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/radius_server_secret.phpt php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_server_secret.phpt
--- php-radius-1.2.7/radius-1.4.0b1/tests/radius_server_secret.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/radius_server_secret.phpt	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,32 @@
+--TEST--
+radius_server_secret(): load from radius_add_server()
+--INI--
+display_errors=1
+error_reporting=-1
+--SKIPIF--
+<?php
+if (!extension_loaded('radius')) echo 'SKIP: radius extension required';
+?>
+--FILE--
+<?php
+$res = radius_acct_open();
+radius_add_server($res, 'localhost', 1234, 'a shared secret', 5, 3);
+var_dump(radius_server_secret($res));
+radius_close($res);
+
+// This shouldn't create a server, but crashed before 8f1de6f.
+$res = radius_acct_open();
+radius_add_server($res, 'what.is.hopefully.a.nonexistent.domain', 1234, 'a shared secret', 5, 3);
+var_dump(radius_server_secret($res));
+var_dump(radius_strerror($res));
+radius_close($res);
+
+$res = radius_acct_open();
+var_dump(radius_server_secret($res));
+radius_close($res);
+?>
+--EXPECTF--
+string(15) "a shared secret"
+bool(false)
+string(27) "No RADIUS servers specified"
+bool(false)
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/server/attribute.php php-radius-1.4.0~b1/radius-1.4.0b1/tests/server/attribute.php
--- php-radius-1.2.7/radius-1.4.0b1/tests/server/attribute.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/server/attribute.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * Basic, non-vendored RADIUS attributes.
+ *
+ * @author Adam Harvey <aharvey@php.net>
+ */
+
+namespace RADIUS\FakeServer\Attribute;
+
+/** An attribute in a RADIUS request or response. */
+class Attribute {
+    /**
+     * The number of bytes consumed when parsing.
+     *
+     * @var integer $consumed
+     */
+    var $consumed;
+
+    /**
+     * Whether the attribute is salted.
+     *
+     * @var boolean $salted
+     */
+    var $salted = false;
+
+    /**
+     * An optional attribute tag.
+     *
+     * @var integer $tag
+     */
+    var $tag;
+
+    /**
+     * The attribute type.
+     *
+     * @var integer $type
+     */
+    var $type;
+
+    /**
+     * The attribute value.
+     *
+     * @var string $value
+     */
+    var $value;
+
+    /**
+     * Serialises the attribute into the RADIUS wire structure.
+     *
+     * @return string
+     */
+    function serialise() {
+        return pack('CC', $this->type, strlen($this->value) + 2).$this->value;
+    }
+}
+
+/**
+ * Compares two attributes for equality.
+ *
+ * @param Attribute $expected
+ * @param Attribute $actual
+ * @return boolean
+ */
+function compare($expected, $actual) {
+    if (is_a($expected, 'VendorSpecificAttribute')) {
+        if (!is_a($actual, 'VendorSpecificAttribute')) {
+            return false;
+        }
+
+        if ($expected->salted) {
+            $expectedLength = (16 * ceil(strlen($expected->value) / 16) + 3);
+
+            if ($expected->tag) {
+                $tag = unpack('Ctag', $actual->value);
+                return (($expected->type == $actual->type) && (strlen($actual->value) == $expectedLength + 1) && ($expected->tag == $tag['tag']));
+            } else {
+                return (($expected->type == $actual->type) && (strlen($actual->value) == $expectedLength));
+            }
+        } else {
+            return ($expected->type == $actual->type) && ($expected->value == $actual->value) && ($expected->vendorId == $actual->vendorId) && ($expected->vendorType == $actual->vendorType);
+        }
+        $expectedLength = (16 * ceil(strlen($expected->value) / 16) + 3);
+
+        if ($expected->tag) {
+            $tag = unpack('Ctag', $actual->value);
+            return (($expected->type == $actual->type) && (strlen($actual->value) == $expectedLength + 1) && ($expected->tag == $tag['tag']));
+        } else {
+            return (($expected->type == $actual->type) && (strlen($actual->value) == $expectedLength));
+        }
+    } elseif ($expected->salted) {
+        $expectedLength = (16 * ceil(strlen($expected->value) / 16) + 3);
+
+        if ($expected->tag) {
+            $tag = unpack('Ctag', $actual->value);
+            return (($expected->type == $actual->type) && (strlen($actual->value) == $expectedLength + 1) && ($expected->tag == $tag['tag']));
+        } else {
+            return (($expected->type == $actual->type) && (strlen($actual->value) == $expectedLength));
+        }
+    } else {
+        return ($expected->type == $actual->type) && ($expected->value == $actual->value);
+    }
+}
+
+/**
+ * Creates an attribute with the given type and value.
+ *
+ * @param integer $type
+ * @param string  $value
+ * @param integer $tag
+ * @return Attribute
+ */
+function expect($type, $value, $tag = null, $salted = false) {
+    $attribute = new Attribute;
+
+    $attribute->salted = $salted;
+    $attribute->type = $type;
+
+    if (!is_null($tag)) {
+        $attribute->tag = $tag;
+        $attribute->value = pack('C', $tag).$value;
+    } else {
+        $attribute->value = $value;
+    }
+
+    return $attribute;
+}
+
+/**
+ * Parses the given attribute from a RADIUS packet.
+ *
+ * The error checking here is minimal, to say the least. We don't even
+ * check the size field is valid.
+ *
+ * @param string $raw
+ * @return Attribute
+ */
+function parse($raw) {
+    $attribute = new Attribute;
+    $data = unpack('Ctype/Csize', $raw);
+
+    if ($data['type'] == RADIUS_VENDOR_SPECIFIC) {
+        return \RADIUS\FakeServer\VendorSpecificAttribute\parse($raw);
+    }
+
+    $attribute->consumed = $data['size'];
+    $attribute->type = $data['type'];
+    $attribute->value = substr($raw, 2, $data['size'] - 2);
+
+    return $attribute;
+}
+
+// vim: set ts=4 sw=4 et:
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/server/fake_server.php php-radius-1.4.0~b1/radius-1.4.0b1/tests/server/fake_server.php
--- php-radius-1.2.7/radius-1.4.0b1/tests/server/fake_server.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/server/fake_server.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,346 @@
+<?php
+
+/**
+ * A basic set of classes that allow a RADIUS server to be mocked.
+ *
+ * @author Adam Harvey <aharvey@php.net>
+ */
+
+namespace RADIUS\FakeServer;
+
+require __DIR__.'/attribute.php';
+require __DIR__.'/vsa.php';
+
+/** A RADIUS request. */
+class Request {
+    /**
+     * The request attributes.
+     *
+     * @var Attribute[] $attributes
+     */
+    var $attributes = array();
+
+    /**
+     * The authenticator field from the packet.
+     *
+     * @var string $authenticator
+     */
+    var $authenticator;
+
+    /**
+     * The request code.
+     *
+     * @var integer $code
+     */
+    var $code;
+
+    /**
+     * The request identifier.
+     *
+     * @var integer $id
+     */
+    var $id;
+
+    /**
+     * The raw request data.
+     *
+     * @var string $raw
+     */
+    var $raw;
+
+    /**
+     * Compares an actual request to its expected values.
+     *
+     * If the comparison fails, the error message is printed.
+     *
+     * @param Request $expected
+     * @param Request $actual
+     * @return boolean
+     */
+    static function compare($expected, $actual) {
+        if ($expected->code != $actual->code) {
+            printf("Expected code %d does not match actual code %d\n", $expected->code, $actual->code);
+            return false;
+        }
+
+        foreach ($expected->attributes as $attribute) {
+            $found = false;
+
+            foreach ($actual->attributes as $actual_attr) {
+                if (\RADIUS\FakeServer\Attribute\compare($attribute, $actual_attr)) {
+                    $found = true;
+                    break;
+                }
+            }
+
+            if (!$found) {
+                printf("Expected attribute %d with value '%s' not found in attribute set\n", $attribute->type, bin2hex($attribute->value));
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Creates a new Request with the given code and attributes.
+     *
+     * @param integer     $code
+     * @param Attribute[] $attributes
+     * @return Request
+     */
+    static function expect($code, $attributes = array()) {
+        $request = new Request;
+
+        $request->code = $code;
+        $request->attributes = $attributes;
+
+        return $request;
+    }
+
+    /**
+     * Parses a RADIUS request packet.
+     *
+     * @param string $raw
+     * @return Request
+     */
+    static function parse($raw) {
+        $request = new Request;
+        $data = unpack('Ccode/Cid/nsize', $raw);
+
+        $request->raw = $raw;
+        $request->code = $data['code'];
+        $request->id = $data['id'];
+        $request->authenticator = substr($raw, 4, 16);
+        $attributes = substr($raw, 20);
+
+        while (strlen($attributes)) {
+            $attribute = \RADIUS\FakeServer\Attribute\parse($attributes);
+            $attributes = substr($attributes, $attribute->consumed);
+            $request->attributes[] = $attribute;
+        }
+
+        return $request;
+    }
+}
+
+/** A basic RADIUS response containing arbitrary data. */
+class Response {
+    /**
+     * The data to send.
+     *
+     * @var string $data
+     */
+    var $data;
+
+    /**
+     * Serialises the data (which in this case means do nothing).
+     *
+     * @param Request $request The request being responded to.
+     * @param string  $secret  The shared secret.
+     * @return string The RADIUS response packet.
+     */
+    function serialise($request, $secret) {
+        return $this->data;
+    }
+}
+
+/** A higher level RADIUS response packet that handles encoding and packing. */
+class RadiusResponse extends Response {
+    /**
+     * The attributes to include.
+     *
+     * @var Attribute[] $attributes
+     */
+    var $attributes;
+
+    /**
+     * The response code.
+     *
+     * @var integer $code
+     */
+    var $code;
+
+    /**
+     * Serialises the data into a RADIUS response packet.
+     *
+     * @param Request $request The request being responded to.
+     * @param string  $secret  The shared secret.
+     * @return string The RADIUS response packet.
+     */
+    function serialise($request, $secret) {
+        $attributes = '';
+        if (is_array($this->attributes)) {
+            foreach ($this->attributes as $attribute) {
+                $attributes .= $attribute->serialise();
+            }
+        }
+
+        $header = pack('CCn', $this->code, $request->id, 20 + strlen($attributes));
+        $auth = md5($header.$request->authenticator.$attributes.$secret);
+        $auth = pack('H*', $auth);
+        return $header.$auth.$attributes;
+    }
+}
+
+/** The fake RADIUS server. */
+class FakeServer {
+    /**
+     * The address to listen at.
+     *
+     * @var string $address
+     */
+    var $address = '127.0.0.1';
+
+    /**
+     * The port to listen on.
+     *
+     * @var integer $port
+     */
+    var $port = 63563;
+
+    /**
+     * The RADIUS shared secret.
+     *
+     * @var string $secret
+     */
+    var $secret = 'This is a shared secret';
+
+    /**
+     * The expected transactions that will occur once the server starts
+     * handing requests.
+     *
+     * @access private
+     * @var array[] $transactions
+     */
+    var $transactions = array();
+
+    /**
+     * Adds an expected transaction.
+     *
+     * @param Request  $request  The request to expect.
+     * @param Response $response The response to issue in response to the
+     *                           request. If omitted or NULL, no response will
+     *                           be sent.
+     * @return void
+     */
+    function addTransaction($expectedRequest, $response = null) {
+        $this->transactions[] = array(
+            'request'  => clone $expectedRequest,
+            'response' => clone $response,
+        );
+    }
+
+    /**
+     * Convenience method to create an accounting client resource for this
+     * server.
+     *
+     * @return resource
+     */
+    function getAcctResource() {
+        $res = radius_acct_open();
+        radius_add_server($res, $this->address, $this->port, $this->secret, 5, 1);
+
+        return $res;
+    }
+
+    /**
+     * Convenience method to create an authentication client resource for this
+     * server.
+     *
+     * @return resource
+     */
+    function getAuthResource() {
+        $res = radius_auth_open();
+        radius_add_server($res, $this->address, $this->port, $this->secret, 5, 1);
+
+        return $res;
+    }
+
+    /**
+     * Forks the server and handles requests.
+     *
+     * @return integer The child PID.
+     */
+    function handle() {
+        // Hook up the signal handler for the child's signal that it's ready.
+        pcntl_signal(SIGUSR1, array($this, 'signal'));
+
+        $pid = pcntl_fork();
+
+        if ($pid == 0) {
+            $success = true;
+            $socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+            socket_bind($socket, $this->address, $this->port);
+
+            // Tell the parent we're good to go.
+            posix_kill(posix_getppid(), SIGUSR1);
+
+            while (count($this->transactions)) {
+                $buffer = null;
+                $from = null;
+                $port = null;
+
+                socket_recvfrom($socket, $buffer, 4096, 0, $from, $port);
+                $request = Request::parse($buffer);
+                $transaction = array_shift($this->transactions);
+
+                if (Request::compare($transaction['request'], $request)) {
+                    if (!is_null($transaction['response'])) {
+                        $response = $transaction['response']->serialise($request, $this->secret);
+                        socket_sendto($socket, $response, strlen($response), 0, $from, $port);
+                    }
+                } else {
+                    echo "ERROR: Request did not match\n";
+                    $success = false;
+                    break;
+                }
+            }
+
+            socket_close($socket);
+            exit(!$success);
+        } else {
+            // Wait for SIGUSR1 from the child process to indicate it's
+            // started up. If it takes more than 10 seconds, there are bigger
+            // problems.
+            if (sleep(10) || version_compare(phpversion(), '5.0.0', '<')) {
+                // OK, the child is ready.
+                return $pid;
+            } else {
+                echo "ERROR: Fake RADIUS server never signalled it was ready\n";
+                posix_kill($pid, SIGINT);
+
+                return null;
+            }
+        }
+    }
+
+    /**
+     * Tests if a test involving the fake server should be skipped due to PHP
+     * lacking support for a required feature.
+     *
+     * @return boolean
+     */
+    function skip() {
+        return !(function_exists('socket_create') && function_exists('pcntl_fork') && function_exists('radius_acct_open'));
+    }
+
+    /**
+     * The signal handler which does nothing, successfully.
+     *
+     * @param integer $signo
+     * @return void
+     */
+    function signal($signo) {
+    }
+
+    /**
+     * Waits for the child process to finish running and returns the exit code.
+     *
+     * @return integer
+     */
+    function wait() {
+        pcntl_waitpid(-1, $status);
+        return $status;
+    }
+}
diff -Nru php-radius-1.2.7/radius-1.4.0b1/tests/server/vsa.php php-radius-1.4.0~b1/radius-1.4.0b1/tests/server/vsa.php
--- php-radius-1.2.7/radius-1.4.0b1/tests/server/vsa.php	1970-01-01 00:00:00.000000000 +0000
+++ php-radius-1.4.0~b1/radius-1.4.0b1/tests/server/vsa.php	2016-02-15 15:11:50.000000000 +0000
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Vendored RADIUS attributes.
+ *
+ * @author Adam Harvey <aharvey@php.net>
+ */
+
+namespace RADIUS\FakeServer\VendorSpecificAttribute;
+
+use RADIUS\FakeServer\Attribute\Attribute;
+
+/** A vendor specific attribute. */
+class VendorSpecificAttribute extends Attribute {
+    /**
+     * The vendor ID.
+     *
+     * @var integer $vendorId
+     */
+    var $vendorId;
+
+    /**
+     * The vendor type.
+     *
+     * @var integer $vendorType
+     */
+    var $vendorType;
+
+    /** {@inheritDoc} */
+    function serialise() {
+        return pack('CCNCC', $this->type, strlen($this->value) + 8, $this->vendorId, $this->vendorType, strlen($this->value) + 2);
+    }
+}
+
+/**
+ * Creates a vendor specific attribute with the given ID, type and value.
+ *
+ * @param integer $vendorId
+ * @param integer $vendorType
+ * @param string  $value
+ * @param integer $tag
+ * @return VendorSpecificAttribute
+ */
+function expect($vendorId, $vendorType, $value, $tag = null, $salted = false) {
+    $attribute = new VendorSpecificAttribute;
+
+    $attribute->salted = $salted;
+    $attribute->type = RADIUS_VENDOR_SPECIFIC;
+    $attribute->vendorId = $vendorId;
+    $attribute->vendorType = $vendorType;
+
+    if (!is_null($tag)) {
+        $attribute->tag = $tag;
+        $attribute->value = pack('C', $tag).$value;
+    } else {
+        $attribute->value = $value;
+    }
+
+    return $attribute;
+}
+
+/** {@inheritDoc} */
+function parse($raw) {
+    $attribute = new VendorSpecificAttribute;
+    $attribute->type = RADIUS_VENDOR_SPECIFIC;
+    $data = unpack('Ctype/Csize/NvendorId/CvendorType/CvendorSize', $raw);
+
+    if ($data['type'] != RADIUS_VENDOR_SPECIFIC) {
+        trigger_error('VendorSpecificAttribute::parse() called for a non-VS attribute', E_USER_ERROR);
+    }
+
+    $attribute->consumed = $data['size'];
+    $attribute->vendorId = $data['vendorId'];
+    $attribute->vendorType = $data['vendorType'];
+    $attribute->value = substr($raw, 8, $data['vendorSize'] - 2);
+
+    return $attribute;
+}
+
+// vim: set ts=4 sw=4 et: