Attachment #235959 for bug #265899

View | Details | Raw Unified | Return to bug 265899
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/net/pecl-radius/Makefile (-1 / +1 lines)
1	PORTNAME= radius	1	PORTNAME= radius
2	PORTVERSION= 1.4.0b1	2	PORTVERSION= 1.4.0b1
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= net security pear	4	CATEGORIES= net security pear
5		5
6	MAINTAINER= sunpoet@FreeBSD.org	6	MAINTAINER= sunpoet@FreeBSD.org




--- pecl-compat/src/zend_resource.h

--- pecl-compat/src/zend_resource.h.orig	2016-02-15 15:11:50 UTC
+++ pecl-compat/src/zend_resource.h
@@ -54,7 +54,7 @@
  *

 
 /**
  * Fetches the resource.
@@ -68,7 +68,7 @@ static void compat_zend_delete_resource(const zval *zv TSRMLS_DC);
  * @return A void pointer to the resource, which needs to be typecast, or NULL
  *         on error.
  */

 
 /**
  * Registers a new resource.
@@ -77,12 +77,12 @@ static void *compat_zend_fetch_resource(zval *zv, const char *rsrc_type_name, in
  * @param ptr       A void pointer to the resource.
  * @param rsrc_type The resource type ID.
  */

 {
 	if (IS_RESOURCE != Z_TYPE_P(zv)) {
 		return;
@@ -91,7 +91,7 @@ static void compat_zend_delete_resource(const zval *zv TSRMLS_DC)
 	zend_list_close(Z_RES_P(zv));
 }
 

 {
 	if (IS_RESOURCE != Z_TYPE_P(zv)) {
 		return NULL;
@@ -100,7 +100,7 @@ static void *compat_zend_fetch_resource(zval *zv, const char *rsrc_type_name, in
 	return zend_fetch_resource(Z_RES_P(zv), rsrc_type_name, rsrc_type);
 }
 

 {
 	ZVAL_RES(zv, zend_register_resource(ptr, rsrc_type));
 }
@@ -111,7 +111,7 @@ static void compat_zend_register_resource(zval *zv, void *ptr, int rsrc_type TSR
 /* Used for destructors. */
 typedef zend_rsrc_list_entry zend_resource;
 

 {
 	if (IS_RESOURCE != Z_TYPE_P(zv)) {
 		return;
@@ -120,16 +120,16 @@ static void compat_zend_delete_resource(const zval *zv TSRMLS_DC)
 	zend_list_delete(Z_LVAL_P(zv));
 }
 

 {
 	ZEND_REGISTER_RESOURCE(zv, ptr, rsrc_type);
 }
--- radius.c
+++ radius.c
@@ -51,12 +51,12 @@ any other GPL-like (LGPL, GPL2) License.
 

 	if (!radh) { \
 		RETURN_FALSE; \
 	}
@@ -65,6 +65,102 @@ static int _init_options(struct rad_attr_options *out, int options, int tag);
 ZEND_DECLARE_MODULE_GLOBALS(radius)
 */
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_auth_open, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_acct_open arginfo_radius_auth_open
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_close, 0, 0, 1)
+	ZEND_ARG_INFO(0, "radius_handle")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_strerror arginfo_radius_close
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_config, 0, 0, 2)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "file")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_add_server, 0, 0, 6)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "hostname")
+	ZEND_ARG_INFO(0, "port")
+	ZEND_ARG_INFO(0, "secret")
+	ZEND_ARG_INFO(0, "timeout")
+	ZEND_ARG_INFO(0, "max_tries")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_create_request, 0, 0, 2)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "type")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_string, 0, 0, 3)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "type")
+	ZEND_ARG_INFO(0, "value")
+	ZEND_ARG_INFO(0, "options")
+	ZEND_ARG_INFO(0, "tag")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_put_int	arginfo_radius_put_string
+#define arginfo_radius_put_attr	arginfo_radius_put_string
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_addr, 0, 0, 3)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "type")
+	ZEND_ARG_INFO(0, "addr")
+	ZEND_ARG_INFO(0, "options")
+	ZEND_ARG_INFO(0, "tag")
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_string, 0, 0, 4)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "vendor")
+	ZEND_ARG_INFO(0, "type")
+	ZEND_ARG_INFO(0, "value")
+	ZEND_ARG_INFO(0, "options")
+	ZEND_ARG_INFO(0, "tag")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_put_vendor_int	arginfo_radius_put_vendor_string
+#define arginfo_radius_put_vendor_attr	arginfo_radius_put_vendor_string
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_addr, 0, 0, 4)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "vendor")
+	ZEND_ARG_INFO(0, "type")
+	ZEND_ARG_INFO(0, "addr")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_send_request	arginfo_radius_close
+#define arginfo_radius_get_attr		arginfo_radius_close
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_data, 0, 0, 1)
+	ZEND_ARG_INFO(0, "data")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_get_tagged_attr_tag	arginfo_radius_get_tagged_attr_data
+#define arginfo_radius_get_vendor_attr		arginfo_radius_get_tagged_attr_data
+#define arginfo_radius_cvt_addr			arginfo_radius_get_tagged_attr_data
+#define arginfo_radius_cvt_int			arginfo_radius_get_tagged_attr_data
+#define arginfo_radius_cvt_string		arginfo_radius_get_tagged_attr_data
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_salt_encrypt_attr, 0, 0, 2)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "data")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_request_authenticator	arginfo_radius_close
+#define arginfo_radius_server_secret		arginfo_radius_close
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle, 0, 0, 2)
+	ZEND_ARG_INFO(0, "radius_handle")
+	ZEND_ARG_INFO(0, "mangled")
+ZEND_END_ARG_INFO()
+
+#define arginfo_radius_demangle_mppe_key arginfo_radius_demangle
+
 /* True global resources - no need for thread safety here */
 static int le_radius;
 
@@ -73,34 +169,34 @@ static int le_radius;
  * 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)    
+	PHP_FE(radius_auth_open,		arginfo_radius_auth_open)
+	PHP_FE(radius_acct_open,		arginfo_radius_acct_open)
+	PHP_FE(radius_close,			arginfo_radius_close)
+	PHP_FE(radius_strerror,			arginfo_radius_strerror)
+	PHP_FE(radius_config,			arginfo_radius_config)
+	PHP_FE(radius_add_server,		arginfo_radius_add_server)
+	PHP_FE(radius_create_request,		arginfo_radius_create_request)
+	PHP_FE(radius_put_string,		arginfo_radius_put_string)
+	PHP_FE(radius_put_int,			arginfo_radius_put_int)
+	PHP_FE(radius_put_attr,			arginfo_radius_put_attr)
+	PHP_FE(radius_put_addr,			arginfo_radius_put_addr)
+	PHP_FE(radius_put_vendor_string,	arginfo_radius_put_vendor_string)
+	PHP_FE(radius_put_vendor_int,		arginfo_radius_put_vendor_int)
+	PHP_FE(radius_put_vendor_attr,		arginfo_radius_put_vendor_attr)
+	PHP_FE(radius_put_vendor_addr,		arginfo_radius_put_vendor_addr)
+	PHP_FE(radius_send_request,		arginfo_radius_send_request)
+	PHP_FE(radius_get_attr,			arginfo_radius_get_attr)
+	PHP_FE(radius_get_tagged_attr_data,	arginfo_radius_get_tagged_attr_data)
+	PHP_FE(radius_get_tagged_attr_tag,	arginfo_radius_get_tagged_attr_tag)
+	PHP_FE(radius_get_vendor_attr,		arginfo_radius_get_vendor_attr)
+	PHP_FE(radius_cvt_addr,			arginfo_radius_cvt_addr)
+	PHP_FE(radius_cvt_int,			arginfo_radius_cvt_int)
+	PHP_FE(radius_cvt_string,		arginfo_radius_cvt_string)
+	PHP_FE(radius_salt_encrypt_attr,	arginfo_radius_salt_encrypt_attr)
+	PHP_FE(radius_request_authenticator,	arginfo_radius_request_authenticator)
+	PHP_FE(radius_server_secret,		arginfo_radius_server_secret)
+	PHP_FE(radius_demangle,			arginfo_radius_demangle)
+	PHP_FE(radius_demangle_mppe_key,	arginfo_radius_demangle_mppe_key)
 	{NULL, NULL, NULL}	/* Must be the last line in radius_functions[] */
 };
 /* }}} */
@@ -165,7 +261,7 @@ PHP_FUNCTION(radius_auth_open)
 	struct rad_handle *radh = rad_auth_open();
 
 	if (radh != NULL) {

 	} else {
 		RETURN_FALSE;
 	}
@@ -178,7 +274,7 @@ PHP_FUNCTION(radius_acct_open)
 	struct rad_handle *radh = rad_acct_open();
 
 	if (radh != NULL) {

 	} else {
 		RETURN_FALSE;
 	}
@@ -191,13 +287,13 @@ PHP_FUNCTION(radius_close)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 	RETURN_TRUE;
 }
 /* }}} */
@@ -209,7 +305,7 @@ PHP_FUNCTION(radius_strerror)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		return;
 	}
 
@@ -227,7 +323,7 @@ PHP_FUNCTION(radius_config)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		return;
 	}
 
@@ -250,7 +346,7 @@ PHP_FUNCTION(radius_add_server)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		&hostname, &hostname_len,
 		&port,
 		&secret, &secret_len,
@@ -275,7 +371,7 @@ PHP_FUNCTION(radius_create_request)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		return;
 	}
 
@@ -299,7 +395,7 @@ PHP_FUNCTION(radius_put_string)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		== FAILURE) {
 		return;
 	}
@@ -324,7 +420,7 @@ PHP_FUNCTION(radius_put_int)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		== FAILURE) {
 		return;
 	}
@@ -351,7 +447,7 @@ PHP_FUNCTION(radius_put_attr)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		== FAILURE) {
 		return;
 	}
@@ -380,7 +476,7 @@ PHP_FUNCTION(radius_put_addr)
 	zval *z_radh;
 	struct in_addr intern_addr;
 

 		== FAILURE) {
 		return;
 	}
@@ -412,7 +508,7 @@ PHP_FUNCTION(radius_put_vendor_string)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		== FAILURE) {
 		return;
 	}
@@ -437,7 +533,7 @@ PHP_FUNCTION(radius_put_vendor_int)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		== FAILURE) {
 		return;
 	}
@@ -464,7 +560,7 @@ PHP_FUNCTION(radius_put_vendor_attr)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		&data, &len, &options, &tag) == FAILURE) {
 		return;
 	}
@@ -492,7 +588,7 @@ PHP_FUNCTION(radius_put_vendor_addr)
 	zval *z_radh;
 	struct in_addr intern_addr;
 

 		&type, &addr, &addrlen, &options, &tag) == FAILURE) {
 		return;
 	}
@@ -521,7 +617,7 @@ PHP_FUNCTION(radius_send_request)
 	zval *z_radh;
 	int res;
 

 		== FAILURE) {
 		return;
 	}
@@ -546,7 +642,7 @@ PHP_FUNCTION(radius_get_attr)
 	size_t len;
 	zval *z_radh;
 

 		return;
 	}
 
@@ -574,7 +670,7 @@ PHP_FUNCTION(radius_get_tagged_attr_data)
 	const char *attr;
 	COMPAT_ARG_SIZE_T len;
 

 		return;
 	}
 
@@ -595,7 +691,7 @@ PHP_FUNCTION(radius_get_tagged_attr_tag)
 	const char *attr;
 	COMPAT_ARG_SIZE_T len;
 

 		return;
 	}
 
@@ -617,7 +713,7 @@ PHP_FUNCTION(radius_get_vendor_attr)
 	unsigned char type;
 	size_t data_len;
 

 		return;
 	}
 
@@ -642,7 +738,7 @@ PHP_FUNCTION(radius_cvt_addr)
 	COMPAT_ARG_SIZE_T len;
 	struct in_addr addr;
 

 		return;
 	}
 
@@ -659,7 +755,7 @@ PHP_FUNCTION(radius_cvt_int)
 	COMPAT_ARG_SIZE_T len;
 	int val;
 

 		== FAILURE) {
 		return;
 	}
@@ -676,7 +772,7 @@ PHP_FUNCTION(radius_cvt_string)
 	char *val;
 	COMPAT_ARG_SIZE_T len;
 

 		== FAILURE) {
 		return;
 	}
@@ -698,7 +794,7 @@ PHP_FUNCTION(radius_salt_encrypt_attr)
 	struct rad_salted_value salted;
 	zval *z_radh;
 

 		return;
 	}
 
@@ -724,7 +820,7 @@ PHP_FUNCTION(radius_request_authenticator)
 	char buf[LEN_AUTH];
 	zval *z_radh;
 

 		return;
 	}
 
@@ -746,7 +842,7 @@ PHP_FUNCTION(radius_server_secret)
 	struct rad_handle *radh;
 	zval *z_radh;
 

 		return;
 	}
 
@@ -771,7 +867,7 @@ PHP_FUNCTION(radius_demangle)
 	COMPAT_ARG_SIZE_T len;
 	int res;
 

 		return;
 	}
 
@@ -802,7 +898,7 @@ PHP_FUNCTION(radius_demangle_mppe_key)
 	COMPAT_ARG_SIZE_T len;
 	int res;
 

 		return;
 	}
 
@@ -844,7 +940,7 @@ int _init_options(struct rad_attr_options *out, int options, int tag) {
 /* }}} */
 
 /* {{{ _radius_close() */

 {
 	struct rad_handle *radh = (struct rad_handle *)res->ptr;
 	rad_close(radh);
--- radlib.c
+++ radlib.c
@@ -497,9 +497,9 @@ rad_continue_send_request(struct rad_handle *h, int selected, int *fd,
 
 	if (selected) {
 		struct sockaddr_in from;
-		int fromlen;
+		socklen_t fromlen;
 
-		fromlen = sizeof from;
+		fromlen = sizeof(from);
 		h->resp_len = recvfrom(h->fd, h->response,
 		    MSGSIZE, MSG_WAITALL, (struct sockaddr *)&from, &fromlen);
 		if (h->resp_len == -1) {
@@ -581,8 +581,7 @@ rad_create_request(struct rad_handle *h, int code)
 	/* Create a random authenticator */
 	for (i = 0;  i < LEN_AUTH;  i += 2) {

 		h->errmsg[0] = '\0';
 		memset(h->request, 0, sizeof h->request);
 		h->req_len = 0;
@@ -1035,7 +1033,7 @@ rad_put_vendor_attr(struct rad_handle *h, int vendor, int type,
 	/* OK, allocate and start building the attribute. */
 	attr = emalloc(va_len);
 	if (attr == NULL) {
-		generr(h, "malloc failure (%d bytes)", va_len);
+		generr(h, "malloc failure (%zu bytes)", va_len);
 		goto end;
 	}
 
@@ -1218,12 +1216,12 @@ rad_demangle_mppe_key(struct rad_handle *h, const void *mangled, size_t mlen, u_
 	*/
 	*len = *P;
 	if (*len > mlen - 1) {
-		generr(h, "Mangled data seems to be garbage %d %d", *len, mlen-1);        
+		generr(h, "Mangled data seems to be garbage %zu %lu", *len, mlen-1);
 		return -1;
 	}
 
 	if (*len > MPPE_KEY_LEN) {
-		generr(h, "Key to long (%d) for me max. %d", *len, MPPE_KEY_LEN);        
+		generr(h, "Key to long (%zu) for me max. %d", *len, MPPE_KEY_LEN);
 		return -1;
 	}
 
@@ -1235,14 +1233,13 @@ int rad_salt_value(struct rad_handle *h, const char *in, size_t len, struct rad_
 {
 	char authenticator[16];
 	size_t i;
-	char intermediate[16];
+	unsigned char intermediate[16];
 	const char *in_pos;
 	MD5_CTX md5;
 	char *out_pos;
 	php_uint32 random;
 	size_t salted_len;
 	const char *secret;

 
 	if (len == 0) {
 		out->len = 0;
@@ -1276,7 +1273,7 @@ int rad_salt_value(struct rad_handle *h, const char *in, size_t len, struct rad_
 	memset(out->data, 0, out->len);
 
 	/* Grab the request authenticator. */
-	if (rad_request_authenticator(h, authenticator, sizeof authenticator) != sizeof authenticator) {
+	if (rad_request_authenticator(h, authenticator, sizeof(authenticator)) != sizeof(authenticator)) {
 		generr(h, "Cannot obtain the RADIUS request authenticator");
 		goto err;
 	}
@@ -1289,7 +1286,7 @@ int rad_salt_value(struct rad_handle *h, const char *in, size_t len, struct rad_
 	}
 
 	/* Generate a random number to use as the salt. */

 
 	/* The RFC requires that the high bit of the salt be 1. Otherwise,
 	 * let's set up the header. */
@@ -1301,7 +1298,7 @@ int rad_salt_value(struct rad_handle *h, const char *in, size_t len, struct rad_
 	 * calls b1 first. */
 	MD5Init(&md5);
 	MD5Update(&md5, secret, strlen(secret));
-	MD5Update(&md5, authenticator, sizeof authenticator);
+	MD5Update(&md5, authenticator, sizeof(authenticator));
 	MD5Update(&md5, out->data, 2);
 	MD5Final(intermediate, &md5);
 

Return to bug 265899