f4501347c9
Of the remaining implementations left, ssl3_, dtls1_, and ssl23_, dtls1_ is redundant and can be folded into ssl3_. ssl23_ actually isn't; it sets 5 minutes rather than 2 hours. Two hours seems to be what everything else uses and seems a saner default. Most consumers seem to override it anyway (SSL_CTX_set_timeout). But it is a behavior change. The method is called at two points: - SSL_get_default_timeout - SSL_CTX_new Incidentally, the latter call actually makes the former never called internally and the value it returns a lie. SSL_get_default_timeout returns the default timeout of the /current/ method, but in ssl_get_new_session, the timeout is shadowed by session_timeout on the context. That is initialized when SSL_CTX_new is called. So, unless you go out of your way to SSL_CTX_set_timeout(0), it always overrides. (And it actually used to a difference because, for SSL23, the SSL_CTX's method is SSL23, but, when session creation happens, the SSL's method is the version-specific one.) Change-Id: I331d3fd69b726242b36492402717b6d0b521c6ee Reviewed-on: https://boringssl-review.googlesource.com/1521 Reviewed-by: Adam Langley <agl@google.com>
132 lines
4.3 KiB
C
132 lines
4.3 KiB
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
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
* included with this distribution is covered by the same copyright terms
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
|
*
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
* the code are not to be removed.
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
* as the author of the parts of the library used.
|
|
* This can be in the form of a textual message at program startup or
|
|
* in documentation (online or textual) provided with the package.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* "This product includes cryptographic software written by
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
* being used are not cryptographic related :-).
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* The licence and distribution terms for any publically available version or
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
* copied and put under another distribution licence
|
|
* [including the GNU Public Licence.] */
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <openssl/err.h>
|
|
#include <openssl/obj.h>
|
|
|
|
#include "ssl_locl.h"
|
|
|
|
int ssl23_read(SSL *s, void *buf, int len)
|
|
{
|
|
int n;
|
|
|
|
ERR_clear_system_error();
|
|
if (SSL_in_init(s) && (!s->in_handshake))
|
|
{
|
|
n=s->handshake_func(s);
|
|
if (n < 0) return(n);
|
|
if (n == 0)
|
|
{
|
|
OPENSSL_PUT_ERROR(SSL, ssl23_read, SSL_R_SSL_HANDSHAKE_FAILURE);
|
|
return(-1);
|
|
}
|
|
return(SSL_read(s,buf,len));
|
|
}
|
|
else
|
|
{
|
|
ssl_undefined_function(s);
|
|
return(-1);
|
|
}
|
|
}
|
|
|
|
int ssl23_peek(SSL *s, void *buf, int len)
|
|
{
|
|
int n;
|
|
|
|
ERR_clear_system_error();
|
|
if (SSL_in_init(s) && (!s->in_handshake))
|
|
{
|
|
n=s->handshake_func(s);
|
|
if (n < 0) return(n);
|
|
if (n == 0)
|
|
{
|
|
OPENSSL_PUT_ERROR(SSL, ssl23_peek, SSL_R_SSL_HANDSHAKE_FAILURE);
|
|
return(-1);
|
|
}
|
|
return(SSL_peek(s,buf,len));
|
|
}
|
|
else
|
|
{
|
|
ssl_undefined_function(s);
|
|
return(-1);
|
|
}
|
|
}
|
|
|
|
int ssl23_write(SSL *s, const void *buf, int len)
|
|
{
|
|
int n;
|
|
|
|
ERR_clear_system_error();
|
|
if (SSL_in_init(s) && (!s->in_handshake))
|
|
{
|
|
n=s->handshake_func(s);
|
|
if (n < 0) return(n);
|
|
if (n == 0)
|
|
{
|
|
OPENSSL_PUT_ERROR(SSL, ssl23_write, SSL_R_SSL_HANDSHAKE_FAILURE);
|
|
return(-1);
|
|
}
|
|
return(SSL_write(s,buf,len));
|
|
}
|
|
else
|
|
{
|
|
ssl_undefined_function(s);
|
|
return(-1);
|
|
}
|
|
}
|