Add callback to handle encrypted client keys

mosquitto.c

@@ -18,6 +18,7 @@ zend_object_handlers mosquitto_std_object_handlers;
 ZEND_DECLARE_MODULE_GLOBALS(mosquitto)
 
 static inline mosquitto_client_object *mosquitto_client_object_get(zval *zobj TSRMLS_DC);
+static int php_mosquitto_pw_callback(char *buf, int size, int rwflag, void *userdata);
 
 /* {{{ Arginfo */
 
@@ -121,6 +122,7 @@ PHP_METHOD(Mosquitto_Client, setTlsCertificates)
  int ca_path_len = 0, cert_path_len = 0, key_path_len = 0, key_pw_len, retval = 0;
  zval *stat;
  zend_bool is_dir = 0;
+ int (*pw_callback)(char *, int, int, void *) = NULL;
 
  PHP_MOSQUITTO_ERROR_HANDLING();
  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!|s!s!s!",
@@ -148,10 +150,16 @@ PHP_METHOD(Mosquitto_Client, setTlsCertificates)
  is_dir = Z_BVAL_P(stat);
  zval_dtor(stat);
 
+ if (key_pw != NULL) {
+ pw_callback = php_mosquitto_pw_callback;
+ MQTTG(client_key) = estrdup(key_pw);
+ MQTTG(client_key_len) = key_pw_len;
+ }
+
  if (is_dir) {
- retval = mosquitto_tls_set(object->client, NULL, ca_path, cert_path, key_path, NULL);
+ retval = mosquitto_tls_set(object->client, NULL, ca_path, cert_path, key_path, pw_callback);
  } else {
- retval = mosquitto_tls_set(object->client, ca_path, NULL, cert_path, key_path, NULL);
+ retval = mosquitto_tls_set(object->client, ca_path, NULL, cert_path, key_path, pw_callback);
  }
 
  php_mosquitto_handle_errno(retval, errno TSRMLS_CC);
@@ -1070,6 +1078,14 @@ PHP_MOSQUITTO_API void php_mosquitto_unsubscribe_callback(struct mosquitto *mosq
  }
 }
 
+static int php_mosquitto_pw_callback(char *buf, int size, int rwflag, void *userdata) {
+ TSRMLS_FETCH();
+
+ strncpy(buf, MQTTG(client_key), size);
+ efree(MQTTG(client_key));
+ return MQTTG(client_key_len);
+}
+
 /* {{{ mosquitto_client_methods */
 const zend_function_entry mosquitto_client_methods[] = {
  PHP_ME(Mosquitto_Client, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)

php_mosquitto.h

@@ -128,6 +128,7 @@ static int php_mosquitto_message_write_##name(mosquitto_message_object *mosquitt
 
 ZEND_BEGIN_MODULE_GLOBALS(mosquitto)
  char *client_key;
+ int client_key_len;
  zend_object_handlers mosquitto_std_object_handlers;
  zend_error_handling mosquitto_original_error_handling;
 ZEND_END_MODULE_GLOBALS(mosquitto)