diff options
author | Andy Polyakov <appro@openssl.org> | 2007-10-09 19:19:07 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2007-10-09 19:19:07 +0000 |
commit | 4fe55663df33ca6afc683b7e76ef08ab18fcb188 (patch) | |
tree | 57fc504f1e9bcc1158294735c37c95575c623a10 /ssl | |
parent | ae1552ee9985c58a7f8413ea242060869b358404 (diff) |
Make DTLS1 record layer MAC calculation RFC compliant.
Submitted by: Alex Lam
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/t1_enc.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 4aa7600fe7..011ef3aaca 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -829,6 +829,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) EVP_MD_CTX hmac, *mac_ctx; unsigned char buf[5]; int stream_mac = (send?(ssl->mac_flags & SSL_MAC_FLAG_WRITE_MAC_STREAM):(ssl->mac_flags&SSL_MAC_FLAG_READ_MAC_STREAM)); + if (send) { rec= &(ssl->s3->wrec); @@ -847,8 +848,8 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) md_size=EVP_MD_CTX_size(hash); buf[0]=rec->type; - buf[1]=TLS1_VERSION_MAJOR; - buf[2]=TLS1_VERSION_MINOR; + buf[1]=(unsigned char)(ssl->version>>8); + buf[2]=(unsigned char)(ssl->version); buf[3]=rec->length>>8; buf[4]=rec->length&0xff; @@ -861,8 +862,20 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) { EVP_MD_CTX_copy(&hmac,hash); mac_ctx = &hmac; - } - EVP_DigestSignUpdate(mac_ctx,seq,8); + } + + if (ssl->version == DTLS1_VERSION) + { + unsigned char dtlsseq[8],*p=dtlsseq; + + s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p); + memcpy (p,&seq[2],6); + + EVP_DigestSignUpdate(mac_ctx,dtlsseq,8); + } + else + EVP_DigestSignUpdate(mac_ctx,seq,8); + EVP_DigestSignUpdate(mac_ctx,buf,5); EVP_DigestSignUpdate(mac_ctx,rec->input,rec->length); if (stream_mac) EVP_MD_CTX_copy(&hmac,hash); @@ -879,8 +892,8 @@ printf("rec="); {unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); } #endif - if ( SSL_version(ssl) != DTLS1_VERSION) - { + if (ssl->version != DTLS1_VERSION) + { for (i=7; i>=0; i--) { ++seq[i]; |