Deleted Added
sdiff udiff text old ( 205128 ) new ( 215697 )
full compact
d1_enc.c (205128) d1_enc.c (215697)
1/* ssl/d1_enc.c */
2/*
3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
5 */
6/* ====================================================================
7 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
8 *

--- 117 unchanged lines hidden (view full) ---

126#include <openssl/des.h>
127#endif
128
129int dtls1_enc(SSL *s, int send)
130 {
131 SSL3_RECORD *rec;
132 EVP_CIPHER_CTX *ds;
133 unsigned long l;
1/* ssl/d1_enc.c */
2/*
3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
5 */
6/* ====================================================================
7 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
8 *

--- 117 unchanged lines hidden (view full) ---

126#include <openssl/des.h>
127#endif
128
129int dtls1_enc(SSL *s, int send)
130 {
131 SSL3_RECORD *rec;
132 EVP_CIPHER_CTX *ds;
133 unsigned long l;
134 int bs,i,ii,j,k,n=0;
134 int bs,i,ii,j,k;
135 const EVP_CIPHER *enc;
136
137 if (send)
138 {
135 const EVP_CIPHER *enc;
136
137 if (send)
138 {
139 if (s->write_hash != NULL)
140 n=EVP_MD_size(s->write_hash);
141 ds=s->enc_write_ctx;
142 rec= &(s->s3->wrec);
143 if (s->enc_write_ctx == NULL)
144 enc=NULL;
145 else
146 {
147 enc=EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
148 if ( rec->data != rec->input)

--- 4 unchanged lines hidden (view full) ---

153 {
154 if (RAND_bytes(rec->input, EVP_CIPHER_block_size(ds->cipher)) <= 0)
155 return -1;
156 }
157 }
158 }
159 else
160 {
139 ds=s->enc_write_ctx;
140 rec= &(s->s3->wrec);
141 if (s->enc_write_ctx == NULL)
142 enc=NULL;
143 else
144 {
145 enc=EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
146 if ( rec->data != rec->input)

--- 4 unchanged lines hidden (view full) ---

151 {
152 if (RAND_bytes(rec->input, EVP_CIPHER_block_size(ds->cipher)) <= 0)
153 return -1;
154 }
155 }
156 }
157 else
158 {
161 if (s->read_hash != NULL)
162 n=EVP_MD_size(s->read_hash);
163 ds=s->enc_read_ctx;
164 rec= &(s->s3->rrec);
165 if (s->enc_read_ctx == NULL)
166 enc=NULL;
167 else
168 enc=EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
169 }
170

--- 116 unchanged lines hidden --- 		159 ds=s->enc_read_ctx;
160 rec= &(s->s3->rrec);
161 if (s->enc_read_ctx == NULL)
162 enc=NULL;
163 else
164 enc=EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
165 }
166

--- 116 unchanged lines hidden ---