apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r652677 - in /apr/apr-util/trunk: CHANGES include/apr_ldap_option.h ldap/apr_ldap_option.c
Date Thu, 01 May 2008 21:44:25 GMT
Author: minfrin
Date: Thu May  1 14:44:25 2008
New Revision: 652677

URL: http://svn.apache.org/viewvc?rev=652677&view=rev
Log:
Add support for OpenLDAP's ability to support a directory of
certificate authorities. [Eric Covener]

Modified:
    apr/apr-util/trunk/CHANGES
    apr/apr-util/trunk/include/apr_ldap_option.h
    apr/apr-util/trunk/ldap/apr_ldap_option.c

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=652677&r1=652676&r2=652677&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Thu May  1 14:44:25 2008
@@ -5,6 +5,9 @@
 
 Changes with APR-util 1.3.0
 
+  *) Add support for OpenLDAP's ability to support a directory of 
+     certificate authorities. [Eric Covener]
+
   *) Ensure that the LDAP code can compile cleanly on platforms that do
      not define the LDAP_OPT_REFHOPLIMIT symbol, most specifically Windows.
      [Victor <victorjss@gmail.com>, Graham Leggett]

Modified: apr/apr-util/trunk/include/apr_ldap_option.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_ldap_option.h?rev=652677&r1=652676&r2=652677&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_ldap_option.h (original)
+++ apr/apr-util/trunk/include/apr_ldap_option.h Thu May  1 14:44:25 2008
@@ -147,6 +147,11 @@
 #define APR_LDAP_CERT_TYPE_PFX      13
 /** PKCS#12 encoded private key */
 #define APR_LDAP_KEY_TYPE_PFX       14
+/** Openldap directory full of base64-encoded cert 
+ * authorities with hashes in corresponding .0 directory
+ */
+#define APR_LDAP_CA_TYPE_CACERTDIR_BASE64 15
+
 
 /**
  * Certificate structure.

Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ldap/apr_ldap_option.c?rev=652677&r1=652676&r2=652677&view=diff
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c Thu May  1 14:44:25 2008
@@ -590,6 +590,13 @@
                                          (void *)ents[i].path);
             result->msg = ldap_err2string(result->rc);
             break;
+#ifdef LDAP_OPT_X_TLS_CACERTDIR
+        case APR_LDAP_CA_TYPE_CACERTDIR_BASE64:
+            result->rc = ldap_set_option(ldap, LDAP_OPT_X_TLS_CACERTDIR,
+                                         (void *)ents[i].path);
+            result->msg = ldap_err2string(result->rc);
+            break;
+#endif
         default:
             result->rc = -1;
             result->reason = "LDAP: The OpenLDAP SDK only understands the "



Mime
View raw message