Upstream openssl to version 1.0.1c

patches/jsse.patch

 --- openssl-1.0.0b.orig/ssl/ssl.h       2010-11-30 00:03:46.000000000 +0000
 +++ openssl-1.0.0b/ssl/ssl.h    2010-11-30 00:03:47.000000000 +0000
 @@ -1133,6 +1133,9 @@ struct ssl_st
         /* This can also be in the session once a session is established */
         SSL_SESSION *session;
  
 +        /* This can be disabled to prevent the use of uncached sessions */
 +       int session_creation_enabled;
 +
         /* Default generate session ID callback. */
         GEN_SESSION_CB generate_session_id;
  
-@@ -1546,6 +1549,7 @@ const SSL_CIPHER *SSL_get_current_cipher
- int    SSL_CIPHER_get_bits(const SSL_CIPHER *c,int *alg_bits);
- char * SSL_CIPHER_get_version(const SSL_CIPHER *c);
- const char *   SSL_CIPHER_get_name(const SSL_CIPHER *c);
-+const char *   SSL_CIPHER_authentication_method(const SSL_CIPHER *c);
- 
- int    SSL_get_fd(const SSL *s);
- int    SSL_get_rfd(const SSL *s);
 @@ -1554,6 +1558,7 @@ const char  * SSL_get_cipher_list(const 
  char * SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
  int    SSL_get_read_ahead(const SSL * s);
  int    SSL_pending(const SSL *s);
 +const char *   SSL_authentication_method(const SSL *c);
  #ifndef OPENSSL_NO_SOCK
  int    SSL_set_fd(SSL *s, int fd);
  int    SSL_set_rfd(SSL *s, int fd);
 @@ -1565,6 +1570,7 @@ BIO *     SSL_get_rbio(const SSL *s);
  BIO *  SSL_get_wbio(const SSL *s);
@@ skipping 10 matching lines @@
 +int    SSL_use_certificate_chain(SSL *ssl, STACK_OF(X509) *cert_chain);
 +STACK_OF(X509) * SSL_get_certificate_chain(SSL *ssl, X509 *x);
  
  #ifndef OPENSSL_NO_STDIO
  int    SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
 @@ -1615,6 +1623,7 @@ void      SSL_copy_session_id(SSL *to,const S
  SSL_SESSION *SSL_SESSION_new(void);
  const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
                                         unsigned int *len);
 +const char *   SSL_SESSION_get_version(const SSL_SESSION *s);
+ unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
  #ifndef OPENSSL_NO_FP_API
  int    SSL_SESSION_print_fp(FILE *fp,const SSL_SESSION *ses);
- #endif
 @@ -1624,6 +1633,7 @@ int       SSL_SESSION_print(BIO *fp,const SSL_
  void   SSL_SESSION_free(SSL_SESSION *ses);
  int    i2d_SSL_SESSION(SSL_SESSION *in,unsigned char **pp);
  int    SSL_set_session(SSL *to, SSL_SESSION *session);
 +void   SSL_set_session_creation_enabled(SSL *, int);
  int    SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
  int    SSL_CTX_remove_session(SSL_CTX *,SSL_SESSION *c);
  int    SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
 @@ -2066,6 +2076,7 @@ void ERR_load_SSL_strings(void);
  #define SSL_F_SSL_UNDEFINED_VOID_FUNCTION               244
@@ skipping 225 matching lines @@
 +       s->cipher_list_by_id = tmp_cipher_list;
 +       (void)sk_SSL_CIPHER_set_cmp_func(s->cipher_list_by_id,ssl_cipher_ptr_id_cmp);
 +
 +       sk_SSL_CIPHER_sort(s->cipher_list_by_id);
 +       return 1;
 +       }
 +
  /* works well for SSLv2, not so good for SSLv3 */
  char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
         {
-@@ -2551,18 +2578,45 @@ SSL_METHOD *ssl_bad_method(int ver)
+@@ -2551,22 +2578,45 @@ SSL_METHOD *ssl_bad_method(int ver)
         return(NULL);
         }
  
 -const char *SSL_get_version(const SSL *s)
 +static const char *ssl_get_version(int version)
         {
+-       if (s->version == TLS1_2_VERSION)
++       if (version == TLS1_2_VERSION)
+                return("TLSv1.2");
+-       else if (s->version == TLS1_1_VERSION)
++       else if (version == TLS1_1_VERSION)
+                return("TLSv1.1");
 -       if (s->version == TLS1_VERSION)
 +       if (version == TLS1_VERSION)
                 return("TLSv1");
 -       else if (s->version == SSL3_VERSION)
 +       else if (version == SSL3_VERSION)
                 return("SSLv3");
 -       else if (s->version == SSL2_VERSION)
 +       else if (version == SSL2_VERSION)
                 return("SSLv2");
         else
@@ skipping 11 matching lines @@
 +       }
 +
 +const char* SSL_authentication_method(const SSL* ssl)
 +       {
 +       if (ssl->cert != NULL && ssl->cert->rsa_tmp != NULL)
 +               return SSL_TXT_RSA "_" SSL_TXT_EXPORT;
 +       switch (ssl->version)
 +               {
 +       case SSL2_VERSION:
 +               return SSL_TXT_RSA;
-+       case SSL3_VERSION:
-+       case TLS1_VERSION:
-+       case DTLS1_VERSION:
++       default:
 +               return SSL_CIPHER_authentication_method(ssl->s3->tmp.new_cipher);
-+       default:
-+               return "UNKNOWN";
 +               }
 +       }
 +
  SSL *SSL_dup(SSL *s)
         {
         STACK_OF(X509_NAME) *sk;
 --- openssl-1.0.0b.orig/ssl/ssl_locl.h  2010-11-30 00:03:46.000000000 +0000
 +++ openssl-1.0.0b/ssl/ssl_locl.h       2010-11-30 00:03:47.000000000 +0000
 @@ -456,6 +456,7 @@
  typedef struct cert_pkey_st
@@ skipping 64 matching lines @@
         /* This gets used by clients and servers. */
 @@ -269,6 +274,8 @@ int ssl_get_new_session(SSL *s, int sess
         SSL_SESSION *ss=NULL;
         GEN_SESSION_CB cb = def_generate_session_id;
  
 +       /* caller should check this if they can do better error handling */
 +        if (!s->session_creation_enabled) return(0);
         if ((ss=SSL_SESSION_new()) == NULL) return(0);
  
         /* If the context has a default timeout, use it */