Add SSL_get_client_certificate_types.

openssl/ssl/ssl_cert.c

 /*! \file ssl/ssl_cert.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 642 matching lines @@
 int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x)
         {
         return(add_client_CA(&(ctx->client_CA),x));
         }
 
 static int xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
         {
         return(X509_NAME_cmp(*a,*b));
         }
 
+void SSL_get_client_certificate_types(SSL *s, char **ctype, size_t *ctype_num)
+        {
+        /* Nothing to return for the server or SSL2. */
+        if (s->type != SSL_ST_CONNECT ||

[agl, 2014/04/25 01:03:35]

Maybe:

if (s->server ||

[davidben, 2014/04/25 17:03:34]

Done.

+                ((s->version >> 8) != SSL3_VERSION_MAJOR) ||

[agl, 2014/04/25 01:03:35]

s->version > SSL3_VERSION && s->version != DTLS1_BAD_VER, I think.

[davidben, 2014/04/25 17:03:34]

Do you mean < SSL3_VERSION? Did that version. (Owwww. Why'd I have to go look up
how DTLS version numbers work... what were they thinking)

Would it be sufficient to drop all of these and just leave the s->s3 check? That
seems somewhat simpler. I just pulled these checks from SSL_get_client_CA_list.

+                (s->s3 == NULL))
+                {
+                *ctype = NULL;
+                *ctype_num = 0;
+                return;
+                }
+
+        *ctype = s->s3->tmp.ctype;
+        *ctype_num = s->s3->tmp.ctype_num;
+        }
+
 #ifndef OPENSSL_NO_STDIO
 /*!
  * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
  * it doesn't really have anything to do with clients (except that a common use
  * for a stack of CAs is to send it to the client). Actually, it doesn't have
  * much to do with CAs, either, since it will load any old cert.
  * \param file the file containing one or more certs.
  * \return a ::STACK containing the certs.
  */
 STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
@@ skipping 171 matching lines @@
                 }
 
         ret = 1;
 
 err:
         if (d) OPENSSL_DIR_end(&d);
         CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
         return ret;
         }