diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-06-14 19:45:16 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-06-14 19:45:16 +0000 |
| commit | db522d3ae42d8f706499b4b4bc97836292ab180b (patch) | |
| tree | 90cf0e59374e08e88c1514f35c4b2aab0cccd66d /crypto/openssl/ssl/d1_enc.c | |
| parent | c2919fd8ff94c932db22574ea40588912805799e (diff) | |
| parent | 27de41c0e2f408da6b42112c27b4dad0a07432e0 (diff) | |
| download | src-db522d3ae42d8f706499b4b4bc97836292ab180b.tar.gz src-db522d3ae42d8f706499b4b4bc97836292ab180b.zip | |
Merge OpenSSL 0.9.8k into head.
Approved by: re
Notes
Notes:
svn path=/head/; revision=194206
Diffstat (limited to 'crypto/openssl/ssl/d1_enc.c')
| -rw-r--r-- | crypto/openssl/ssl/d1_enc.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/crypto/openssl/ssl/d1_enc.c b/crypto/openssl/ssl/d1_enc.c index cbff7495c502..cf3332e4e43d 100644 --- a/crypto/openssl/ssl/d1_enc.c +++ b/crypto/openssl/ssl/d1_enc.c @@ -115,12 +115,16 @@ #include <stdio.h> #include "ssl_locl.h" +#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> +#endif #include <openssl/evp.h> #include <openssl/hmac.h> #include <openssl/md5.h> #include <openssl/rand.h> - +#ifdef KSSL_DEBUG +#include <openssl/des.h> +#endif int dtls1_enc(SSL *s, int send) { @@ -202,10 +206,11 @@ int dtls1_enc(SSL *s, int send) { unsigned long ui; printf("EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n", - ds,rec->data,rec->input,l); - printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%d %d], %d iv_len\n", + (void *)ds,rec->data,rec->input,l); + printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%ld %ld], %d iv_len\n", ds->buf_len, ds->cipher->key_len, - DES_KEY_SZ, DES_SCHEDULE_SZ, + (unsigned long)DES_KEY_SZ, + (unsigned long)DES_SCHEDULE_SZ, ds->cipher->iv_len); printf("\t\tIV: "); for (i=0; i<ds->cipher->iv_len; i++) printf("%02X", ds->iv[i]); @@ -230,10 +235,10 @@ int dtls1_enc(SSL *s, int send) #ifdef KSSL_DEBUG { - unsigned long i; + unsigned long ki; printf("\trec->data="); - for (i=0; i<l; i++) - printf(" %02x", rec->data[i]); printf("\n"); + for (ki=0; ki<l; ki++) + printf(" %02x", rec->data[ki]); printf("\n"); } #endif /* KSSL_DEBUG */ |