summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Sikorra <Chad.Sikorra@gmail.com>2016-06-15 22:45:38 -0500
committerChad Sikorra <Chad.Sikorra@gmail.com>2016-06-15 22:45:38 -0500
commit6415a86c9dc6a3bb506749196d8aa70ea20c0c86 (patch)
treebbbc148588054096cccacce8438dfd049ab6e377
parent8880367773e2b15b701da9a221ca4079c720743f (diff)
downloadphp-git-6415a86c9dc6a3bb506749196d8aa70ea20c0c86.tar.gz
Add LDAP TLS Protocol Min constants
-rw-r--r--ext/ldap/ldap.c6
-rw-r--r--ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt38
2 files changed, 44 insertions, 0 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 41f92b719d..53afc945b1 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -262,6 +262,12 @@ PHP_MINIT_FUNCTION(ldap)
#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_MIN", LDAP_OPT_X_TLS_PROTOCOL_MIN, CONST_PERSISTENT | CONST_CS);
+
+ REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_SSL2", LDAP_OPT_X_TLS_PROTOCOL_SSL2, CONST_PERSISTENT | CONST_CS);
+ REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_SSL3", LDAP_OPT_X_TLS_PROTOCOL_SSL3, CONST_PERSISTENT | CONST_CS);
+ REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_0", LDAP_OPT_X_TLS_PROTOCOL_TLS1_0, CONST_PERSISTENT | CONST_CS);
+ REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_1", LDAP_OPT_X_TLS_PROTOCOL_TLS1_1, CONST_PERSISTENT | CONST_CS);
+ REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_2", LDAP_OPT_X_TLS_PROTOCOL_TLS1_2, CONST_PERSISTENT | CONST_CS);
#endif
#ifdef LDAP_OPT_X_TLS_PACKAGE
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
new file mode 100644
index 0000000000..81360d0759
--- /dev/null
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
@@ -0,0 +1,38 @@
+--TEST--
+ldap_set_option() - Basic test for TLS protocol min ldap option
+--CREDITS--
+Chad Sikorra <Chad.Sikorra@gmail.com>
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+require "connect.inc";
+$link = ldap_connect($host, $port);
+
+foreach([
+ LDAP_OPT_X_TLS_PROTOCOL_SSL2,
+ LDAP_OPT_X_TLS_PROTOCOL_SSL3,
+ LDAP_OPT_X_TLS_PROTOCOL_TLS1_0,
+ LDAP_OPT_X_TLS_PROTOCOL_TLS1_1,
+ LDAP_OPT_X_TLS_PROTOCOL_TLS1_2,
+] as $option) {
+ $result = ldap_set_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $option);
+ var_dump($result);
+
+ ldap_get_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $optionval);
+ var_dump($optionval);
+}
+?>
+===DONE===
+--EXPECT--
+bool(true)
+int(512)
+bool(true)
+int(768)
+bool(true)
+int(769)
+bool(true)
+int(770)
+bool(true)
+int(771)
+===DONE===