projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Constify the BIGNUM routines a bit more. The only trouble were the
[openssl.git]
/
ssl
/
t1_enc.c
diff --git
a/ssl/t1_enc.c
b/ssl/t1_enc.c
index 99af1966e61ee22134f4f2a09d74ac7c7b0eeacf..0d34357eb474e58238c3c499aa61c4f3e6962527 100644
(file)
--- a/
ssl/t1_enc.c
+++ b/
ssl/t1_enc.c
@@
-57,9
+57,11
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "comp.h"
-#include "evp.h"
-#include "hmac.h"
+#include <openssl/comp.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
#include "ssl_locl.h"
static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
#include "ssl_locl.h"
static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
@@
-176,7
+178,7
@@
int tls1_change_cipher_state(SSL *s, int which)
{
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 *)
-
M
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
+
OPENSSL_m
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
goto err;
dd= s->enc_read_ctx;
s->read_hash=m;
goto err;
dd= s->enc_read_ctx;
s->read_hash=m;
@@
-195,7
+197,7
@@
int tls1_change_cipher_state(SSL *s, int which)
}
if (s->s3->rrec.comp == NULL)
s->s3->rrec.comp=(unsigned char *)
}
if (s->s3->rrec.comp == NULL)
s->s3->rrec.comp=(unsigned char *)
-
M
alloc(SSL3_RT_MAX_ENCRYPTED_LENGTH);
+
OPENSSL_m
alloc(SSL3_RT_MAX_ENCRYPTED_LENGTH);
if (s->s3->rrec.comp == NULL)
goto err;
}
if (s->s3->rrec.comp == NULL)
goto err;
}
@@
-206,7
+208,7
@@
int tls1_change_cipher_state(SSL *s, int which)
{
if ((s->enc_write_ctx == NULL) &&
((s->enc_write_ctx=(EVP_CIPHER_CTX *)
{
if ((s->enc_write_ctx == NULL) &&
((s->enc_write_ctx=(EVP_CIPHER_CTX *)
-
M
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
+
OPENSSL_m
alloc(sizeof(EVP_CIPHER_CTX))) == NULL))
goto err;
dd= s->enc_write_ctx;
s->write_hash=m;
goto err;
dd= s->enc_write_ctx;
s->write_hash=m;
@@
-353,9
+355,9
@@
int tls1_setup_key_block(SSL *s)
ssl3_cleanup_key_block(s);
ssl3_cleanup_key_block(s);
- if ((p1=(unsigned char *)
M
alloc(num)) == NULL)
+ if ((p1=(unsigned char *)
OPENSSL_m
alloc(num)) == NULL)
goto err;
goto err;
- if ((p2=(unsigned char *)
M
alloc(num)) == NULL)
+ if ((p2=(unsigned char *)
OPENSSL_m
alloc(num)) == NULL)
goto err;
s->s3->tmp.key_block_length=num;
goto err;
s->s3->tmp.key_block_length=num;
@@
-372,7
+374,7
@@
printf("pre-master\n");
#endif
tls1_generate_key_block(s,p1,p2,num);
memset(p2,0,num);
#endif
tls1_generate_key_block(s,p1,p2,num);
memset(p2,0,num);
-
F
ree(p2);
+
OPENSSL_f
ree(p2);
#ifdef TLS_DEBUG
printf("\nkey block\n");
{ int z; for (z=0; z<num; z++) printf("%02X%c",p1[z],((z+1)%16)?' ':'\n'); }
#ifdef TLS_DEBUG
printf("\nkey block\n");
{ int z; for (z=0; z<num; z++) printf("%02X%c",p1[z],((z+1)%16)?' ':'\n'); }
@@
-492,7
+494,7
@@
int tls1_cert_verify_mac(SSL *s, EVP_MD_CTX *in_ctx, unsigned char *out)
}
int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
}
int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
-
unsigned
char *str, int slen, unsigned char *out)
+
const
char *str, int slen, unsigned char *out)
{
unsigned int i;
EVP_MD_CTX ctx;
{
unsigned int i;
EVP_MD_CTX ctx;
@@
-619,11
+621,11
@@
int tls1_alert_code(int code)
case SSL_AD_ACCESS_DENIED: return(TLS1_AD_ACCESS_DENIED);
case SSL_AD_DECODE_ERROR: return(TLS1_AD_DECODE_ERROR);
case SSL_AD_DECRYPT_ERROR: return(TLS1_AD_DECRYPT_ERROR);
case SSL_AD_ACCESS_DENIED: return(TLS1_AD_ACCESS_DENIED);
case SSL_AD_DECODE_ERROR: return(TLS1_AD_DECODE_ERROR);
case SSL_AD_DECRYPT_ERROR: return(TLS1_AD_DECRYPT_ERROR);
- case SSL_AD_EXPORT_RESTRIC
ION: return(TLS1_AD_EXPORT_RESTRIC
ION);
+ case SSL_AD_EXPORT_RESTRIC
TION: return(TLS1_AD_EXPORT_RESTRICT
ION);
case SSL_AD_PROTOCOL_VERSION: return(TLS1_AD_PROTOCOL_VERSION);
case SSL_AD_INSUFFICIENT_SECURITY:return(TLS1_AD_INSUFFICIENT_SECURITY);
case SSL_AD_INTERNAL_ERROR: return(TLS1_AD_INTERNAL_ERROR);
case SSL_AD_PROTOCOL_VERSION: return(TLS1_AD_PROTOCOL_VERSION);
case SSL_AD_INSUFFICIENT_SECURITY:return(TLS1_AD_INSUFFICIENT_SECURITY);
case SSL_AD_INTERNAL_ERROR: return(TLS1_AD_INTERNAL_ERROR);
- case SSL_AD_USER_CANC
LED: return(TLS1_AD_USER_CANC
LED);
+ case SSL_AD_USER_CANC
ELLED: return(TLS1_AD_USER_CANCEL
LED);
case SSL_AD_NO_RENEGOTIATION: return(TLS1_AD_NO_RENEGOTIATION);
default: return(-1);
}
case SSL_AD_NO_RENEGOTIATION: return(TLS1_AD_NO_RENEGOTIATION);
default: return(-1);
}