diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-06 20:59:29 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-06 20:59:29 +0000 |
| commit | 2e22f5e2e00c1f1f599b03634ca27bb5b9ac471e (patch) | |
| tree | a707d3fdb02faa3d4423773ae7b606febaa5e786 /ssl/t1_enc.c | |
| parent | 06369e3974fbc83d3778807c090fbe69f20a27d4 (diff) | |
Notes
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 0c4cddedf85c7..ac8c1539968b4 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -1048,14 +1048,10 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) if (!stream_mac) EVP_MD_CTX_cleanup(&hmac); #ifdef TLS_DEBUG -printf("sec="); -{unsigned int z; for (z=0; z<md_size; z++) printf("%02X ",mac_sec[z]); printf("\n"); } printf("seq="); {int z; for (z=0; z<8; z++) printf("%02X ",seq[z]); printf("\n"); } -printf("buf="); -{int z; for (z=0; z<5; z++) printf("%02X ",buf[z]); printf("\n"); } printf("rec="); -{unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); } +{unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",rec->data[z]); printf("\n"); } #endif if (ssl->version != DTLS1_VERSION && ssl->version != DTLS1_BAD_VER) @@ -1185,7 +1181,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST, TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1; - rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2, + rv = tls1_PRF(ssl_get_algorithm2(s), val, vallen, NULL, 0, NULL, 0, |