PKCS#8 support for alternative PRFs.
[openssl.git] / ssl / ssl_rsa.c
index a8a62f1..49bd035 100644 (file)
  */
 
 #include <stdio.h>
-#include "bio.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
 #include "ssl_locl.h"
+#include <openssl/bio.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
-#ifndef NOPROTO
 static int ssl_set_cert(CERT *c, X509 *x509);
 static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey);
-#else
-static int ssl_set_cert();
-static int ssl_set_pkey();
-#endif
-
-int SSL_use_certificate(ssl, x)
-SSL *ssl;
-X509 *x;
+int SSL_use_certificate(SSL *ssl, X509 *x)
        {
-       CERT *c;
-
        if (x == NULL)
                {
                SSLerr(SSL_F_SSL_USE_CERTIFICATE,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
-       if ((ssl->cert == NULL) || (ssl->cert == ssl->ctx->default_cert))
+       if (!ssl_cert_inst(&ssl->cert))
                {
-               c=ssl_cert_new();
-               if (c == NULL)
-                       {
-                       SSLerr(SSL_F_SSL_USE_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                       return(0);
-                       }
-               if (ssl->cert != NULL) ssl_cert_free(ssl->cert);
-               ssl->cert=c;
+               SSLerr(SSL_F_SSL_USE_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+               return(0);
                }
-       c=ssl->cert;
-
-       return(ssl_set_cert(c,x));
+       return(ssl_set_cert(ssl->cert,x));
        }
 
-#ifndef NO_STDIO
-int SSL_use_certificate_file(ssl, file, type)
-SSL *ssl;
-char *file;
-int type;
+#ifndef OPENSSL_NO_STDIO
+int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
        {
        int j;
        BIO *in;
@@ -130,7 +109,7 @@ int type;
        else if (type == SSL_FILETYPE_PEM)
                {
                j=ERR_R_PEM_LIB;
-               x=PEM_read_bio_X509(in,NULL,ssl->ctx->default_passwd_callback);
+               x=PEM_read_bio_X509(in,NULL,ssl->ctx->default_passwd_callback,ssl->ctx->default_passwd_callback_userdata);
                }
        else
                {
@@ -152,10 +131,7 @@ end:
        }
 #endif
 
-int SSL_use_certificate_ASN1(ssl, len, d)
-SSL *ssl;
-int len;
-unsigned char *d;
+int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
        {
        X509 *x;
        int ret;
@@ -172,12 +148,9 @@ unsigned char *d;
        return(ret);
        }
 
-#ifndef NO_RSA
-int SSL_use_RSAPrivateKey(ssl, rsa)
-SSL *ssl;
-RSA *rsa;
+#ifndef OPENSSL_NO_RSA
+int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
        {
-       CERT *c;
        EVP_PKEY *pkey;
        int ret;
 
@@ -186,41 +159,46 @@ RSA *rsa;
                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
-
-        if ((ssl->cert == NULL) || (ssl->cert == ssl->ctx->default_cert))
-                {
-                c=ssl_cert_new();
-               if (c == NULL)
-                       {
-                       SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                       return(0);
-                       }
-                if (ssl->cert != NULL) ssl_cert_free(ssl->cert);
-               ssl->cert=c;
+       if (!ssl_cert_inst(&ssl->cert))
+               {
+               SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
+               return(0);
                }
-       c=ssl->cert;
        if ((pkey=EVP_PKEY_new()) == NULL)
                {
                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_EVP_LIB);
                return(0);
                }
 
-       CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
+       RSA_up_ref(rsa);
        EVP_PKEY_assign_RSA(pkey,rsa);
 
-       ret=ssl_set_pkey(c,pkey);
+       ret=ssl_set_pkey(ssl->cert,pkey);
        EVP_PKEY_free(pkey);
        return(ret);
        }
 #endif
 
-static int ssl_set_pkey(c,pkey)
-CERT *c;
-EVP_PKEY *pkey;
+static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
        {
-       int i,ok=0,bad=0;
-
-       i=ssl_cert_type(NULL,pkey);
+       int i;
+       /* Special case for DH: check two DH certificate types for a match.
+        * This means for DH certificates we must set the certificate first.
+        */
+       if (pkey->type == EVP_PKEY_DH)
+               {
+               X509 *x;
+               i = -1;
+               x = c->pkeys[SSL_PKEY_DH_RSA].x509;
+               if (x && X509_check_private_key(x, pkey))
+                               i = SSL_PKEY_DH_RSA;
+               x = c->pkeys[SSL_PKEY_DH_DSA].x509;
+               if (i == -1 && x && X509_check_private_key(x, pkey))
+                               i = SSL_PKEY_DH_DSA;
+               ERR_clear_error();
+               }
+       else 
+               i=ssl_cert_type(NULL,pkey);
        if (i < 0)
                {
                SSLerr(SSL_F_SSL_SET_PKEY,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
@@ -229,51 +207,26 @@ EVP_PKEY *pkey;
 
        if (c->pkeys[i].x509 != NULL)
                {
-               EVP_PKEY_copy_parameters(
-                       X509_get_pubkey(c->pkeys[i].x509),pkey);
+               EVP_PKEY *pktmp;
+               pktmp = X509_get_pubkey(c->pkeys[i].x509);
+               EVP_PKEY_copy_parameters(pktmp,pkey);
+               EVP_PKEY_free(pktmp);
                ERR_clear_error();
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                /* Don't check the public/private key, this is mostly
                 * for smart cards. */
                if ((pkey->type == EVP_PKEY_RSA) &&
-                       (RSA_flags(pkey->pkey.rsa) &
-                        RSA_METHOD_FLAG_NO_CHECK))
-                        ok=1;
+                       (RSA_flags(pkey->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK))
+                       ;
                else
 #endif
-                       if (!X509_check_private_key(c->pkeys[i].x509,pkey))
+               if (!X509_check_private_key(c->pkeys[i].x509,pkey))
                        {
-                       if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
-                               {
-                               i=(i == SSL_PKEY_DH_RSA)?
-                                       SSL_PKEY_DH_DSA:SSL_PKEY_DH_RSA;
-
-                               if (c->pkeys[i].x509 == NULL)
-                                       ok=1;
-                               else
-                                       {
-                                       if (!X509_check_private_key(
-                                               c->pkeys[i].x509,pkey))
-                                               bad=1;
-                                       else
-                                               ok=1;
-                                       }
-                               }
-                       else
-                               bad=1;
+                       X509_free(c->pkeys[i].x509);
+                       c->pkeys[i].x509 = NULL;
+                       return 0;
                        }
-               else
-                       ok=1;
-               }
-       else
-               ok=1;
-
-       if (bad)
-               {
-               X509_free(c->pkeys[i].x509);
-               c->pkeys[i].x509=NULL;
-               return(0);
                }
 
        if (c->pkeys[i].privatekey != NULL)
@@ -286,12 +239,9 @@ EVP_PKEY *pkey;
        return(1);
        }
 
-#ifndef NO_RSA
-#ifndef NO_STDIO
-int SSL_use_RSAPrivateKey_file(ssl, file, type)
-SSL *ssl;
-char *file;
-int type;
+#ifndef OPENSSL_NO_RSA
+#ifndef OPENSSL_NO_STDIO
+int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
        {
        int j,ret=0;
        BIO *in;
@@ -318,7 +268,7 @@ int type;
                {
                j=ERR_R_PEM_LIB;
                rsa=PEM_read_bio_RSAPrivateKey(in,NULL,
-                       ssl->ctx->default_passwd_callback);
+                       ssl->ctx->default_passwd_callback,ssl->ctx->default_passwd_callback_userdata);
                }
        else
                {
@@ -338,13 +288,10 @@ end:
        }
 #endif
 
-int SSL_use_RSAPrivateKey_ASN1(ssl,d,len)
-SSL *ssl;
-unsigned char *d;
-long len;
+int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len)
        {
        int ret;
-       unsigned char *p;
+       const unsigned char *p;
        RSA *rsa;
 
        p=d;
@@ -358,13 +305,10 @@ long len;
        RSA_free(rsa);
        return(ret);
        }
-#endif /* !NO_RSA */
+#endif /* !OPENSSL_NO_RSA */
 
-int SSL_use_PrivateKey(ssl, pkey)
-SSL *ssl;
-EVP_PKEY *pkey;
+int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
        {
-       CERT *c;
        int ret;
 
        if (pkey == NULL)
@@ -372,29 +316,17 @@ EVP_PKEY *pkey;
                SSLerr(SSL_F_SSL_USE_PRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
-
-        if ((ssl->cert == NULL) || (ssl->cert == ssl->ctx->default_cert))
-                {
-                c=ssl_cert_new();
-               if (c == NULL)
-                       {
-                       SSLerr(SSL_F_SSL_USE_PRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                       return(0);
-                       }
-                if (ssl->cert != NULL) ssl_cert_free(ssl->cert);
-               ssl->cert=c;
+       if (!ssl_cert_inst(&ssl->cert))
+               {
+               SSLerr(SSL_F_SSL_USE_PRIVATEKEY,ERR_R_MALLOC_FAILURE);
+               return(0);
                }
-       c=ssl->cert;
-
-       ret=ssl_set_pkey(c,pkey);
+       ret=ssl_set_pkey(ssl->cert,pkey);
        return(ret);
        }
 
-#ifndef NO_STDIO
-int SSL_use_PrivateKey_file(ssl, file, type)
-SSL *ssl;
-char *file;
-int type;
+#ifndef OPENSSL_NO_STDIO
+int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
        {
        int j,ret=0;
        BIO *in;
@@ -416,7 +348,12 @@ int type;
                {
                j=ERR_R_PEM_LIB;
                pkey=PEM_read_bio_PrivateKey(in,NULL,
-                       ssl->ctx->default_passwd_callback);
+                       ssl->ctx->default_passwd_callback,ssl->ctx->default_passwd_callback_userdata);
+               }
+       else if (type == SSL_FILETYPE_ASN1)
+               {
+               j = ERR_R_ASN1_LIB;
+               pkey = d2i_PrivateKey_bio(in,NULL);
                }
        else
                {
@@ -436,14 +373,10 @@ end:
        }
 #endif
 
-int SSL_use_PrivateKey_ASN1(type,ssl,d,len)
-int type;
-SSL *ssl;
-unsigned char *d;
-long len;
+int SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len)
        {
        int ret;
-       unsigned char *p;
+       const unsigned char *p;
        EVP_PKEY *pkey;
 
        p=d;
@@ -458,39 +391,25 @@ long len;
        return(ret);
        }
 
-int SSL_CTX_use_certificate(ctx, x)
-SSL_CTX *ctx;
-X509 *x;
+int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x)
        {
-       CERT *c;
-
        if (x == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
-
-       if (ctx->default_cert == NULL)
+       if (!ssl_cert_inst(&ctx->cert))
                {
-               c=ssl_cert_new();
-               if (c == NULL)
-                       {
-                       SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                       return(0);
-                       }
-               ctx->default_cert=c;
+               SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+               return(0);
                }
-       c=ctx->default_cert;
-
-       return(ssl_set_cert(c,x));
+       return(ssl_set_cert(ctx->cert, x));
        }
 
-static int ssl_set_cert(c,x)
-CERT *c;
-X509 *x;
+static int ssl_set_cert(CERT *c, X509 *x)
        {
        EVP_PKEY *pkey;
-       int i,ok=0,bad=0;
+       int i;
 
        pkey=X509_get_pubkey(x);
        if (pkey == NULL)
@@ -503,6 +422,7 @@ X509 *x;
        if (i < 0)
                {
                SSLerr(SSL_F_SSL_SET_CERT,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+               EVP_PKEY_free(pkey);
                return(0);
                }
 
@@ -511,49 +431,29 @@ X509 *x;
                EVP_PKEY_copy_parameters(pkey,c->pkeys[i].privatekey);
                ERR_clear_error();
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                /* Don't check the public/private key, this is mostly
                 * for smart cards. */
                if ((c->pkeys[i].privatekey->type == EVP_PKEY_RSA) &&
                        (RSA_flags(c->pkeys[i].privatekey->pkey.rsa) &
                         RSA_METHOD_FLAG_NO_CHECK))
-                        ok=1;
+                        ;
                else
-#endif
-               {
+#endif /* OPENSSL_NO_RSA */
                if (!X509_check_private_key(x,c->pkeys[i].privatekey))
                        {
-                       if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
-                               {
-                               i=(i == SSL_PKEY_DH_RSA)?
-                                       SSL_PKEY_DH_DSA:SSL_PKEY_DH_RSA;
-
-                               if (c->pkeys[i].privatekey == NULL)
-                                       ok=1;
-                               else
-                                       {
-                                       if (!X509_check_private_key(x,
-                                               c->pkeys[i].privatekey))
-                                               bad=1;
-                                       else
-                                               ok=1;
-                                       }
-                               }
-                       else
-                               bad=1;
+                       /* don't fail for a cert/key mismatch, just free
+                        * current private key (when switching to a different
+                        * cert & key, first this function should be used,
+                        * then ssl_set_pkey */
+                       EVP_PKEY_free(c->pkeys[i].privatekey);
+                       c->pkeys[i].privatekey=NULL;
+                       /* clear error queue */
+                       ERR_clear_error();
                        }
-               else
-                       ok=1;
-               } /* NO_RSA */
                }
-       else
-               ok=1;
 
-       if (bad)
-               {
-               EVP_PKEY_free(c->pkeys[i].privatekey);
-               c->pkeys[i].privatekey=NULL;
-               }
+       EVP_PKEY_free(pkey);
 
        if (c->pkeys[i].x509 != NULL)
                X509_free(c->pkeys[i].x509);
@@ -565,11 +465,8 @@ X509 *x;
        return(1);
        }
 
-#ifndef NO_STDIO
-int SSL_CTX_use_certificate_file(ctx, file, type)
-SSL_CTX *ctx;
-char *file;
-int type;
+#ifndef OPENSSL_NO_STDIO
+int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
        {
        int j;
        BIO *in;
@@ -596,7 +493,7 @@ int type;
        else if (type == SSL_FILETYPE_PEM)
                {
                j=ERR_R_PEM_LIB;
-               x=PEM_read_bio_X509(in,NULL,ctx->default_passwd_callback);
+               x=PEM_read_bio_X509(in,NULL,ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
                }
        else
                {
@@ -618,10 +515,7 @@ end:
        }
 #endif
 
-int SSL_CTX_use_certificate_ASN1(ctx, len, d)
-SSL_CTX *ctx;
-int len;
-unsigned char *d;
+int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d)
        {
        X509 *x;
        int ret;
@@ -638,13 +532,10 @@ unsigned char *d;
        return(ret);
        }
 
-#ifndef NO_RSA
-int SSL_CTX_use_RSAPrivateKey(ctx, rsa)
-SSL_CTX *ctx;
-RSA *rsa;
+#ifndef OPENSSL_NO_RSA
+int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
        {
        int ret;
-       CERT *c;
        EVP_PKEY *pkey;
 
        if (rsa == NULL)
@@ -652,37 +543,27 @@ RSA *rsa;
                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
-       if (ctx->default_cert == NULL)
+       if (!ssl_cert_inst(&ctx->cert))
                {
-               c=ssl_cert_new();
-               if (c == NULL)
-                       {
-                       SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                       return(0);
-                       }
-               ctx->default_cert=c;
+               SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
+               return(0);
                }
-       c=ctx->default_cert;
-
        if ((pkey=EVP_PKEY_new()) == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_EVP_LIB);
                return(0);
                }
 
-       CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
+       RSA_up_ref(rsa);
        EVP_PKEY_assign_RSA(pkey,rsa);
 
-       ret=ssl_set_pkey(c,pkey);
+       ret=ssl_set_pkey(ctx->cert, pkey);
        EVP_PKEY_free(pkey);
        return(ret);
        }
 
-#ifndef NO_STDIO
-int SSL_CTX_use_RSAPrivateKey_file(ctx, file, type)
-SSL_CTX *ctx;
-char *file;
-int type;
+#ifndef OPENSSL_NO_STDIO
+int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
        {
        int j,ret=0;
        BIO *in;
@@ -709,7 +590,7 @@ int type;
                {
                j=ERR_R_PEM_LIB;
                rsa=PEM_read_bio_RSAPrivateKey(in,NULL,
-                       ctx->default_passwd_callback);
+                       ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
                }
        else
                {
@@ -729,13 +610,10 @@ end:
        }
 #endif
 
-int SSL_CTX_use_RSAPrivateKey_ASN1(ctx,d,len)
-SSL_CTX *ctx;
-unsigned char *d;
-long len;
+int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len)
        {
        int ret;
-       unsigned char *p;
+       const unsigned char *p;
        RSA *rsa;
 
        p=d;
@@ -749,40 +627,25 @@ long len;
        RSA_free(rsa);
        return(ret);
        }
-#endif /* !NO_RSA */
+#endif /* !OPENSSL_NO_RSA */
 
-int SSL_CTX_use_PrivateKey(ctx, pkey)
-SSL_CTX *ctx;
-EVP_PKEY *pkey;
+int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey)
        {
-       CERT *c;
-
        if (pkey == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
-               
-       if (ctx->default_cert == NULL)
+       if (!ssl_cert_inst(&ctx->cert))
                {
-               c=ssl_cert_new();
-               if (c == NULL)
-                       {
-                       SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                       return(0);
-                       }
-               ctx->default_cert=c;
+               SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY,ERR_R_MALLOC_FAILURE);
+               return(0);
                }
-       c=ctx->default_cert;
-
-       return(ssl_set_pkey(c,pkey));
+       return(ssl_set_pkey(ctx->cert,pkey));
        }
 
-#ifndef NO_STDIO
-int SSL_CTX_use_PrivateKey_file(ctx, file, type)
-SSL_CTX *ctx;
-char *file;
-int type;
+#ifndef OPENSSL_NO_STDIO
+int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
        {
        int j,ret=0;
        BIO *in;
@@ -804,7 +667,12 @@ int type;
                {
                j=ERR_R_PEM_LIB;
                pkey=PEM_read_bio_PrivateKey(in,NULL,
-                       ctx->default_passwd_callback);
+                       ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
+               }
+       else if (type == SSL_FILETYPE_ASN1)
+               {
+               j = ERR_R_ASN1_LIB;
+               pkey = d2i_PrivateKey_bio(in,NULL);
                }
        else
                {
@@ -824,14 +692,11 @@ end:
        }
 #endif
 
-int SSL_CTX_use_PrivateKey_ASN1(type,ctx,d,len)
-int type;
-SSL_CTX *ctx;
-unsigned char *d;
-long len;
+int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d,
+            long len)
        {
        int ret;
-       unsigned char *p;
+       const unsigned char *p;
        EVP_PKEY *pkey;
 
        p=d;
@@ -847,3 +712,391 @@ long len;
        }
 
 
+#ifndef OPENSSL_NO_STDIO
+/* Read a file that contains our certificate in "PEM" format,
+ * possibly followed by a sequence of CA certificates that should be
+ * sent to the peer in the Certificate message.
+ */
+int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
+       {
+       BIO *in;
+       int ret=0;
+       X509 *x=NULL;
+
+       ERR_clear_error(); /* clear error stack for SSL_CTX_use_certificate() */
+
+       in = BIO_new(BIO_s_file_internal());
+       if (in == NULL)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_BUF_LIB);
+               goto end;
+               }
+
+       if (BIO_read_filename(in,file) <= 0)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_SYS_LIB);
+               goto end;
+               }
+
+       x=PEM_read_bio_X509_AUX(in,NULL,ctx->default_passwd_callback,
+                               ctx->default_passwd_callback_userdata);
+       if (x == NULL)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_PEM_LIB);
+               goto end;
+               }
+
+       ret = SSL_CTX_use_certificate(ctx, x);
+
+       if (ERR_peek_error() != 0)
+               ret = 0;  /* Key/certificate mismatch doesn't imply ret==0 ... */
+       if (ret)
+               {
+               /* If we could set up our certificate, now proceed to
+                * the CA certificates.
+                */
+               X509 *ca;
+               int r;
+               unsigned long err;
+
+               SSL_CTX_clear_chain_certs(ctx);
+               
+               while ((ca = PEM_read_bio_X509(in, NULL,
+                                       ctx->default_passwd_callback,
+                                       ctx->default_passwd_callback_userdata))
+                       != NULL)
+                       {
+                       r = SSL_CTX_add0_chain_cert(ctx, ca);
+                       if (!r) 
+                               {
+                               X509_free(ca);
+                               ret = 0;
+                               goto end;
+                               }
+                       /* Note that we must not free r if it was successfully
+                        * added to the chain (while we must free the main
+                        * certificate, since its reference count is increased
+                        * by SSL_CTX_use_certificate). */
+                       }
+               /* When the while loop ends, it's usually just EOF. */
+               err = ERR_peek_last_error();
+               if (ERR_GET_LIB(err) == ERR_LIB_PEM && ERR_GET_REASON(err) == PEM_R_NO_START_LINE)
+                       ERR_clear_error();
+               else 
+                       ret = 0; /* some real error */
+               }
+
+end:
+       if (x != NULL) X509_free(x);
+       if (in != NULL) BIO_free(in);
+       return(ret);
+       }
+#endif
+
+#ifndef OPENSSL_NO_TLSEXT
+static int serverinfo_find_extension(const unsigned char *serverinfo,
+                                    size_t serverinfo_length,
+                                    unsigned short extension_type,
+                                    const unsigned char **extension_data,
+                                    unsigned short *extension_length)
+       {
+       *extension_data = NULL;
+       *extension_length = 0;
+       if (serverinfo == NULL || serverinfo_length == 0)
+               return 0;
+       for (;;)
+               {
+               unsigned short type = 0; /* uint16 */
+               unsigned short len = 0;  /* uint16 */
+
+               /* end of serverinfo */
+               if (serverinfo_length == 0)
+                       return -1; /* Extension not found */
+
+               /* read 2-byte type field */
+               if (serverinfo_length < 2)
+                       return 0; /* Error */
+               type = (serverinfo[0] << 8) + serverinfo[1];
+               serverinfo += 2;
+               serverinfo_length -= 2;
+
+               /* read 2-byte len field */
+               if (serverinfo_length < 2)
+                       return 0; /* Error */
+               len = (serverinfo[0] << 8) + serverinfo[1];
+               serverinfo += 2;
+               serverinfo_length -= 2;
+
+               if (len > serverinfo_length)
+                       return 0; /* Error */
+
+               if (type == extension_type)
+                       {
+                       *extension_data = serverinfo;
+                       *extension_length = len;
+                       return 1; /* Success */
+                       }
+
+               serverinfo += len;
+               serverinfo_length -= len;
+               }
+       return 0; /* Error */
+       }
+
+static int serverinfo_srv_first_cb(SSL *s, unsigned short ext_type,
+                                  const unsigned char *in,
+                                  unsigned short inlen, int *al,
+                                  void *arg)
+       {
+       size_t i = 0;
+
+       if (inlen != 0)
+               {
+               *al = SSL_AD_DECODE_ERROR;
+               return 0;
+               }
+
+       /* if already in list, error out */
+       for (i = 0; i < s->s3->serverinfo_client_tlsext_custom_types_count; i++)
+               {
+               if (s->s3->serverinfo_client_tlsext_custom_types[i] == ext_type)
+                       {
+                       *al = SSL_AD_DECODE_ERROR;
+                       return 0;
+                       }
+               }
+       s->s3->serverinfo_client_tlsext_custom_types_count++;
+       s->s3->serverinfo_client_tlsext_custom_types = OPENSSL_realloc(
+       s->s3->serverinfo_client_tlsext_custom_types,
+       s->s3->serverinfo_client_tlsext_custom_types_count * 2);
+       if (s->s3->serverinfo_client_tlsext_custom_types == NULL)
+               {
+               s->s3->serverinfo_client_tlsext_custom_types_count = 0;
+               *al = TLS1_AD_INTERNAL_ERROR;
+               return 0;
+               }
+       s->s3->serverinfo_client_tlsext_custom_types[
+       s->s3->serverinfo_client_tlsext_custom_types_count - 1] = ext_type;
+
+       return 1;
+       }
+
+static int serverinfo_srv_second_cb(SSL *s, unsigned short ext_type,
+                                   const unsigned char **out, unsigned short *outlen,
+                                   int *al, void *arg)
+       {
+       const unsigned char *serverinfo = NULL;
+       size_t serverinfo_length = 0;
+       size_t i = 0;
+       unsigned int match = 0;
+       /* Did the client send a TLS extension for this type? */
+       for (i = 0; i < s->s3->serverinfo_client_tlsext_custom_types_count; i++)
+               {
+               if (s->s3->serverinfo_client_tlsext_custom_types[i] == ext_type)
+                       {
+                       match = 1;
+                       break;
+                       }
+               }
+       if (!match)
+               {
+               /* extension not sent by client...don't send extension */
+               return -1;
+               }
+
+       /* Is there serverinfo data for the chosen server cert? */
+       if ((ssl_get_server_cert_serverinfo(s, &serverinfo,
+                                           &serverinfo_length)) != 0)
+               {
+               /* Find the relevant extension from the serverinfo */
+               int retval = serverinfo_find_extension(serverinfo, serverinfo_length,
+                                                      ext_type, out, outlen);
+               if (retval == 0)
+                       return 0; /* Error */
+               if (retval == -1)
+                       return -1; /* No extension found, don't send extension */
+               return 1; /* Send extension */
+               }
+       return -1; /* No serverinfo data found, don't send extension */
+       }
+
+/* With a NULL context, this function just checks that the serverinfo data
+   parses correctly.  With a non-NULL context, it registers callbacks for 
+   the included extensions. */
+static int serverinfo_process_buffer(const unsigned char *serverinfo, 
+                                    size_t serverinfo_length, SSL_CTX *ctx)
+       {
+       if (serverinfo == NULL || serverinfo_length == 0)
+               return 0;
+       for (;;)
+               {
+               unsigned short ext_type = 0; /* uint16 */
+               unsigned short len = 0;  /* uint16 */
+
+               /* end of serverinfo */
+               if (serverinfo_length == 0)
+                       return 1;
+
+               /* read 2-byte type field */
+               if (serverinfo_length < 2)
+                       return 0;
+               /* FIXME: check for types we understand explicitly? */
+
+               /* Register callbacks for extensions */
+               ext_type = (serverinfo[0] << 8) + serverinfo[1];
+               if (ctx && !SSL_CTX_set_custom_srv_ext(ctx, ext_type, 
+                                                      serverinfo_srv_first_cb,
+                                                      serverinfo_srv_second_cb, NULL))
+                       return 0;
+
+               serverinfo += 2;
+               serverinfo_length -= 2;
+
+               /* read 2-byte len field */
+               if (serverinfo_length < 2)
+                       return 0;
+               len = (serverinfo[0] << 8) + serverinfo[1];
+               serverinfo += 2;
+               serverinfo_length -= 2;
+
+               if (len > serverinfo_length)
+                       return 0;
+
+               serverinfo += len;
+               serverinfo_length -= len;
+               }
+       }
+
+int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
+                          size_t serverinfo_length)
+       {
+       if (ctx == NULL || serverinfo == NULL || serverinfo_length == 0)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_PASSED_NULL_PARAMETER);
+               return 0;
+               }
+       if (!serverinfo_process_buffer(serverinfo, serverinfo_length, NULL))
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,SSL_R_INVALID_SERVERINFO_DATA);
+               return 0;
+               }
+       if (!ssl_cert_inst(&ctx->cert))
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       if (ctx->cert->key == NULL)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_INTERNAL_ERROR);
+               return 0;
+               }
+       ctx->cert->key->serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo,
+                                                    serverinfo_length);
+       if (ctx->cert->key->serverinfo == NULL)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       memcpy(ctx->cert->key->serverinfo, serverinfo, serverinfo_length);
+       ctx->cert->key->serverinfo_length = serverinfo_length;
+
+       /* Now that the serverinfo is validated and stored, go ahead and 
+        * register callbacks. */
+       if (!serverinfo_process_buffer(serverinfo, serverinfo_length, ctx))
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO,SSL_R_INVALID_SERVERINFO_DATA);
+               return 0;
+               }
+       return 1;
+       }
+
+#ifndef OPENSSL_NO_STDIO
+int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
+       {
+       unsigned char *serverinfo = NULL;
+       size_t serverinfo_length = 0;
+       unsigned char* extension = 0;
+       long extension_length = 0;
+       char* name = NULL;
+       char* header = NULL;
+       char namePrefix[] = "SERVERINFO FOR ";
+       int ret = 0;
+       BIO *bin = NULL;
+       size_t num_extensions = 0;
+
+       if (ctx == NULL || file == NULL)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE,ERR_R_PASSED_NULL_PARAMETER);
+               goto end;
+               }
+
+       bin = BIO_new(BIO_s_file_internal());
+       if (bin == NULL)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_BUF_LIB);
+               goto end;
+               }
+       if (BIO_read_filename(bin, file) <= 0)
+               {
+               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_SYS_LIB);
+               goto end;
+               }
+
+       for (num_extensions=0;; num_extensions++)
+               {
+               if (PEM_read_bio(bin, &name, &header, &extension, &extension_length) == 0)
+                       {
+                       /* There must be at least one extension in this file */
+                       if (num_extensions == 0)
+                               {
+                               SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_NO_PEM_EXTENSIONS);
+                               goto end;
+                               }
+                       else /* End of file, we're done */
+                               break;
+                       }
+               /* Check that PEM name starts with "BEGIN SERVERINFO FOR " */
+               if (strlen(name) < strlen(namePrefix))
+                       {
+                       SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_PEM_NAME_TOO_SHORT);
+                       goto end;
+                       }
+               if (strncmp(name, namePrefix, strlen(namePrefix)) != 0)
+                       {
+                       SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_PEM_NAME_BAD_PREFIX);
+                       goto end;
+                       }
+               /* Check that the decoded PEM data is plausible (valid length field) */
+               if (extension_length < 4 || (extension[2] << 8) + extension[3] != extension_length - 4)
+                       {
+                       SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, SSL_R_BAD_DATA);
+                       goto end;
+                       }
+               /* Append the decoded extension to the serverinfo buffer */
+               serverinfo = OPENSSL_realloc(serverinfo, serverinfo_length + extension_length);
+               if (serverinfo == NULL)
+                       {
+                       SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO_FILE, ERR_R_MALLOC_FAILURE);
+                       goto end;
+                       }
+               memcpy(serverinfo + serverinfo_length, extension, extension_length);
+               serverinfo_length += extension_length;
+
+               OPENSSL_free(name); name = NULL;
+               OPENSSL_free(header); header = NULL;
+               OPENSSL_free(extension); extension = NULL;
+               }
+
+       ret = SSL_CTX_use_serverinfo(ctx, serverinfo, serverinfo_length);
+end:
+       /* SSL_CTX_use_serverinfo makes a local copy of the serverinfo. */
+       OPENSSL_free(name);
+       OPENSSL_free(header);
+       OPENSSL_free(extension);
+       OPENSSL_free(serverinfo);
+       if (bin != NULL)
+               BIO_free(bin);
+       return ret;
+       }
+#endif /* OPENSSL_NO_STDIO */
+#endif /* OPENSSL_NO_TLSEXT */