projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SSL state transitions.
[oweals/openssl.git]
/
ssl
/
d1_enc.c
diff --git
a/ssl/d1_enc.c
b/ssl/d1_enc.c
index cbff7495c502a45c91f27db3d9268bb849329dba..ea5e12ee070e666c125add33a9dd780fbe464740 100644
(file)
--- a/
ssl/d1_enc.c
+++ b/
ssl/d1_enc.c
@@
-120,7
+120,9
@@
#include <openssl/hmac.h>
#include <openssl/md5.h>
#include <openssl/rand.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)
{
int dtls1_enc(SSL *s, int send)
{
@@
-132,8
+134,8
@@
int dtls1_enc(SSL *s, int send)
if (send)
{
if (send)
{
- if (
s->write_hash != NULL
)
- n=EVP_MD_size(s->write_hash);
+ if (
EVP_MD_CTX_md(s->write_hash)
)
+ n=EVP_MD_
CTX_
size(s->write_hash);
ds=s->enc_write_ctx;
rec= &(s->s3->wrec);
if (s->enc_write_ctx == NULL)
ds=s->enc_write_ctx;
rec= &(s->s3->wrec);
if (s->enc_write_ctx == NULL)
@@
-154,8
+156,8
@@
int dtls1_enc(SSL *s, int send)
}
else
{
}
else
{
- if (
s->read_hash != NULL
)
- n=EVP_MD_size(s->read_hash);
+ if (
EVP_MD_CTX_md(s->read_hash)
)
+ n=EVP_MD_
CTX_
size(s->read_hash);
ds=s->enc_read_ctx;
rec= &(s->s3->rrec);
if (s->enc_read_ctx == NULL)
ds=s->enc_read_ctx;
rec= &(s->s3->rrec);
if (s->enc_read_ctx == NULL)