diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-02-21 10:16:30 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-02-21 10:16:30 +0000 |
| commit | 745c70e5658d176a87965526d8839a7da79a6240 (patch) | |
| tree | 28a773e16a41d2a732768259aa887b1f3867e65c /ssl/s3_both.c | |
| parent | 9dd2b2a94092a4a467f9a5fde6973b4df872fd6b (diff) | |
Move MAC computations for Finished from ssl3_read_bytes into
ssl3_get_message, which is more logical (and avoids a bug,
in addition to the one that I introduced yesterday :-)
and makes Microsoft "fast SGC" less special.
MS SGC should still work now without an extra state of its own
(it goes directly to SSL3_ST_SR_CLNT_HELLO_C, which is the usual state
for reading the body of a Client Hello message), however this should
be tested to make sure, and I don't have a MS SGC client.
Diffstat (limited to 'ssl/s3_both.c')
| -rw-r--r-- | ssl/s3_both.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 4d8cafe2be..7efe2dc792 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -292,7 +292,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) while (s->init_num < 4) { i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num], - 4-s->init_num); + 4 - s->init_num); if (i <= 0) { s->rwstate=SSL_READING; @@ -307,12 +307,15 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) if (p[0] == SSL3_MT_HELLO_REQUEST) /* The server may always send 'Hello Request' messages -- * we are doing a handshake anyway now, so ignore them - * if their format is correct */ + * if their format is correct. Does not count for + * 'Finished' MAC. */ if (p[1] == 0 && p[2] == 0 &&p[3] == 0) skip_message = 1; } while (skip_message); + /* s->init_num == 4 */ + if ((mt >= 0) && (*p != mt)) { al=SSL_AD_UNEXPECTED_MESSAGE; @@ -324,12 +327,13 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) (stn == SSL3_ST_SR_CERT_B)) { /* At this point we have got an MS SGC second client - * hello. We need to restart the mac and mac the data - * currently received. + * hello (maybe we should always allow the client to + * start a new handshake?). We need to restart the mac. */ ssl3_init_finished_mac(s); - ssl3_finish_mac(s, p + s->init_num, i); } + + ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, 4); s->s3->tmp.message_type= *(p++); @@ -366,6 +370,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) s->init_num += i; n -= i; } + ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num); *ok=1; return s->init_num; f_err: |