diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 04:58:08 +0100 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2008-11-12 04:58:08 +0100 |
| commit | 6343829a391df59e46e513c84b6264ee71ad9518 (patch) | |
| tree | 9823103bf5828e47081ac906203516bdc332f577 /ssl/d1_enc.c | |
| parent | Tolerate -----BEGIN PKCS #7 SIGNED DATA----- header lines as used by some (diff) | |
| download | openssl-6343829a391df59e46e513c84b6264ee71ad9518.tar.xz openssl-6343829a391df59e46e513c84b6264ee71ad9518.zip | |
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
Diffstat (limited to 'ssl/d1_enc.c')
| -rw-r--r-- | ssl/d1_enc.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ssl/d1_enc.c b/ssl/d1_enc.c index db7dad799b..ea5e12ee07 100644 --- a/ssl/d1_enc.c +++ b/ssl/d1_enc.c @@ -204,13 +204,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", - (void *)ds,rec->data,rec->input,l); - printf("\tEVP_CIPHER_CTX: %ld buf_len, %ld key_len [%ld %ld], %ld iv_len\n", - (unsigned long)ds->buf_len, - (unsigned long)ds->cipher->key_len, - (unsigned long)DES_KEY_SZ, - (unsigned long)DES_SCHEDULE_SZ, - (unsigned long)ds->cipher->iv_len); + ds,rec->data,rec->input,l); + printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%d %d], %d iv_len\n", + ds->buf_len, ds->cipher->key_len, + DES_KEY_SZ, DES_SCHEDULE_SZ, + ds->cipher->iv_len); printf("\t\tIV: "); for (i=0; i<ds->cipher->iv_len; i++) printf("%02X", ds->iv[i]); printf("\n"); @@ -234,10 +232,10 @@ int dtls1_enc(SSL *s, int send) #ifdef KSSL_DEBUG { - unsigned long ki; + unsigned long i; printf("\trec->data="); - for (ki=0; ki<l; i++) - printf(" %02x", rec->data[ki]); printf("\n"); + for (i=0; i<l; i++) + printf(" %02x", rec->data[i]); printf("\n"); } #endif /* KSSL_DEBUG */ |