generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from 0.9.8-stable.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-04-07 16:30:32 +00:00
parent 9d80aa7e3f
commit c184b140df
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -772,6 +772,9 @@
Changes between 0.9.8k and 0.9.8l [xx XXX xxxx] Changes between 0.9.8k and 0.9.8l [xx XXX xxxx]
*) Handle non-blocking I/O properly in SSL_shutdown() call.
[Darryl Miles <darryl-mailinglists@netbauds.net>]
*) Add 2.5.4.* OIDs *) Add 2.5.4.* OIDs
[Ilya O. <vrghost@gmail.com>] [Ilya O. <vrghost@gmail.com>]

17
ssl/s3_lib.c
View File

@ -3138,6 +3138,7 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
int ssl3_shutdown(SSL *s) int ssl3_shutdown(SSL *s)
{ {
int ret;
/* Don't do anything much if we have not done the handshake or /* Don't do anything much if we have not done the handshake or
* we don't want to send messages :-) */ * we don't want to send messages :-) */
@ -3155,18 +3156,32 @@ int ssl3_shutdown(SSL *s)
#endif #endif
/* our shutdown alert has been sent now, and if it still needs /* our shutdown alert has been sent now, and if it still needs
* to be written, s->s3->alert_dispatch will be true */ * to be written, s->s3->alert_dispatch will be true */
if (s->s3->alert_dispatch)
return(-1); /* return WANT_WRITE */
} }
else if (s->s3->alert_dispatch) else if (s->s3->alert_dispatch)
{ {
/* resend it if not sent */ /* resend it if not sent */
#if 1 #if 1
s->method->ssl_dispatch_alert(s); ret=s->method->ssl_dispatch_alert(s);
if(ret == -1)
{
/* we only get to return -1 here the 2nd/Nth
* invocation, we must have already signalled
* return 0 upon a previous invoation,
* return WANT_WRITE */
return(ret);
}
#endif #endif
} }
else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN)) else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
{ {
/* If we are waiting for a close from our peer, we are closed */ /* If we are waiting for a close from our peer, we are closed */
s->method->ssl_read_bytes(s,0,NULL,0,0); s->method->ssl_read_bytes(s,0,NULL,0,0);
if(!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
{
return(-1); /* return WANT_READ */
}
} }
if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) && if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) &&

7
ssl/s3_pkt.c
View File

@ -1350,13 +1350,13 @@ int ssl3_do_change_cipher_spec(SSL *s)
return(1); return(1);
} }
void ssl3_send_alert(SSL *s, int level, int desc) int ssl3_send_alert(SSL *s, int level, int desc)
{ {
/* Map tls/ssl alert value to correct one */ /* Map tls/ssl alert value to correct one */
desc=s->method->ssl3_enc->alert_value(desc); desc=s->method->ssl3_enc->alert_value(desc);
if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION) if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION)
desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have protocol_version alerts */ desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have protocol_version alerts */
if (desc < 0) return; if (desc < 0) return -1;
/* If a fatal one, remove from cache */ /* If a fatal one, remove from cache */
if ((level == 2) && (s->session != NULL)) if ((level == 2) && (s->session != NULL))
SSL_CTX_remove_session(s->ctx,s->session); SSL_CTX_remove_session(s->ctx,s->session);
@ -1365,9 +1365,10 @@ void ssl3_send_alert(SSL *s, int level, int desc)
s->s3->send_alert[0]=level; s->s3->send_alert[0]=level;
s->s3->send_alert[1]=desc; s->s3->send_alert[1]=desc;
if (s->s3->wbuf.left == 0) /* data still being written out? */ if (s->s3->wbuf.left == 0) /* data still being written out? */
s->method->ssl_dispatch_alert(s); return s->method->ssl_dispatch_alert(s);
/* else data is still being written out, we will get written /* else data is still being written out, we will get written
* some time in the future */ * some time in the future */
return -1;
} }
int ssl3_dispatch_alert(SSL *s) int ssl3_dispatch_alert(SSL *s)

2
ssl/ssl_locl.h
View File

@ -857,7 +857,7 @@ int ssl3_send_change_cipher_spec(SSL *s,int state_a,int state_b);
int ssl3_change_cipher_state(SSL *s,int which); int ssl3_change_cipher_state(SSL *s,int which);
void ssl3_cleanup_key_block(SSL *s); void ssl3_cleanup_key_block(SSL *s);
int ssl3_do_write(SSL *s,int type); int ssl3_do_write(SSL *s,int type);
void ssl3_send_alert(SSL *s,int level, int desc); int ssl3_send_alert(SSL *s,int level, int desc);
int ssl3_generate_master_secret(SSL *s, unsigned char *out, int ssl3_generate_master_secret(SSL *s, unsigned char *out,
unsigned char *p, int len); unsigned char *p, int len);
int ssl3_get_req_cert_type(SSL *s,unsigned char *p); int ssl3_get_req_cert_type(SSL *s,unsigned char *p);