projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully resolve signed vs unsigned issue.
[oweals/openssl.git]
/
ssl
/
s2_enc.c
diff --git
a/ssl/s2_enc.c
b/ssl/s2_enc.c
index 1f62acd5b1e6fb1199c350ffe2452e8c51689a7b..ff3395f459e7ad41566a8f226ef5a5fd25a0e9ae 100644
(file)
--- a/
ssl/s2_enc.c
+++ b/
ssl/s2_enc.c
@@
-68,15
+68,14
@@
int ssl2_enc_init(SSL *s, int client)
const EVP_MD *md;
int num;
const EVP_MD *md;
int num;
- if (!ssl_cipher_get_evp(s->session,&c,&md,NULL))
+ if (!ssl_cipher_get_evp(s->session,&c,&md,NULL
,NULL,NULL
))
{
ssl2_return_error(s,SSL2_PE_NO_CIPHER);
SSLerr(SSL_F_SSL2_ENC_INIT,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
return(0);
}
{
ssl2_return_error(s,SSL2_PE_NO_CIPHER);
SSLerr(SSL_F_SSL2_ENC_INIT,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
return(0);
}
-
- s->read_hash=md;
- s->write_hash=md;
+ ssl_replace_hash(&s->read_hash,md);
+ ssl_replace_hash(&s->write_hash,md);
if ((s->enc_read_ctx == NULL) &&
((s->enc_read_ctx=(EVP_CIPHER_CTX *)
if ((s->enc_read_ctx == NULL) &&
((s->enc_read_ctx=(EVP_CIPHER_CTX *)
@@
-176,7
+175,7
@@
void ssl2_mac(SSL *s, unsigned char *md, int send)
/* There has to be a MAC algorithm. */
EVP_MD_CTX_init(&c);
/* There has to be a MAC algorithm. */
EVP_MD_CTX_init(&c);
- EVP_
DigestInit_ex(&c, s->read_hash, NULL
);
+ EVP_
MD_CTX_copy(&c, s->read_hash
);
EVP_DigestUpdate(&c,sec,
EVP_CIPHER_CTX_key_length(s->enc_read_ctx));
EVP_DigestUpdate(&c,act,len);
EVP_DigestUpdate(&c,sec,
EVP_CIPHER_CTX_key_length(s->enc_read_ctx));
EVP_DigestUpdate(&c,act,len);