--------------------- PatchSet 8336 Date: 2006/07/02 20:16:25 Author: hno Branch: ssl-2_6 Tag: (none) Log: Get rid of obsolete sslGetUserEmail function Members: src/ssl_support.c:1.11.2.1->1.11.2.2 src/ssl_support.h:1.6->1.6.18.1 Index: squid/src/ssl_support.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ssl_support.c,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -r1.11.2.1 -r1.11.2.2 --- squid/src/ssl_support.c 2 Jul 2006 20:13:13 -0000 1.11.2.1 +++ squid/src/ssl_support.c 2 Jul 2006 20:16:25 -0000 1.11.2.2 @@ -914,36 +914,6 @@ return ret; } -#if 0 -char * -sslGetUserEmail(SSL * ssl) -{ - X509 *cert; - X509_NAME *name; - - static char email[128]; - - if (!ssl) - return NULL; - cert = SSL_get_peer_certificate(ssl); - if (!cert) - return NULL; - - name = X509_get_subject_name(cert); - - if (X509_NAME_get_text_by_NID(name, NID_pkcs9_emailAddress, email, sizeof(email)) > 0) - return email; - else - return NULL; -} -#endif - -const char * -sslGetUserEmail(SSL * ssl) -{ - return sslGetUserAttribute(ssl, "emailAddress"); -} - const char * sslGetUserCertificatePEM(SSL * ssl) { Index: squid/src/ssl_support.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ssl_support.h,v retrieving revision 1.6 retrieving revision 1.6.18.1 diff -u -r1.6 -r1.6.18.1 --- squid/src/ssl_support.h 17 May 2006 23:51:09 -0000 1.6 +++ squid/src/ssl_support.h 2 Jul 2006 20:16:25 -0000 1.6.18.1 @@ -53,7 +53,6 @@ int ssl_shutdown_method(int); int ssl_verify_domain(const char *host, SSL *); -const char *sslGetUserEmail(SSL * ssl); const char *sslGetUserAttribute(SSL * ssl, const char *attribute); const char *sslGetCAAttribute(SSL * ssl, const char *attribute); const char *sslGetUserCertificatePEM(SSL * ssl);