projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better description of the behaviour of SSL_shutdown() as it is now, broken
[oweals/openssl.git]
/
crypto
/
des
/
enc_read.c
diff --git
a/crypto/des/enc_read.c
b/crypto/des/enc_read.c
index 7399ff7269837ebf756b0bf2dd3be1fce2203edf..5881caf3d54cf4ab0c73073790d58db2af41cdd5 100644
(file)
--- a/
crypto/des/enc_read.c
+++ b/
crypto/des/enc_read.c
@@
-63,7
+63,7
@@
/* This has some uglies in it but it works - even over sockets. */
/*extern int errno;*/
/* This has some uglies in it but it works - even over sockets. */
/*extern int errno;*/
-OPENSSL_
GLOBAL int des_rw_mode
=DES_PCBC_MODE;
+OPENSSL_
IMPLEMENT_GLOBAL(int,des_rw_mode)
=DES_PCBC_MODE;
/*
/*
@@
-84,7
+84,7
@@
OPENSSL_GLOBAL int des_rw_mode=DES_PCBC_MODE;
*/
*/
-int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
+int des_enc_read(int fd, void *buf, int len, des_key_schedule
*
sched,
des_cblock *iv)
{
/* data to be unencrypted */
des_cblock *iv)
{
/* data to be unencrypted */
@@
-103,17
+103,17
@@
int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
if (tmpbuf == NULL)
{
if (tmpbuf == NULL)
{
- tmpbuf=
M
alloc(BSIZE);
+ tmpbuf=
OPENSSL_m
alloc(BSIZE);
if (tmpbuf == NULL) return(-1);
}
if (net == NULL)
{
if (tmpbuf == NULL) return(-1);
}
if (net == NULL)
{
- net=
M
alloc(BSIZE);
+ net=
OPENSSL_m
alloc(BSIZE);
if (net == NULL) return(-1);
}
if (unnet == NULL)
{
if (net == NULL) return(-1);
}
if (unnet == NULL)
{
- unnet=
M
alloc(BSIZE);
+ unnet=
OPENSSL_m
alloc(BSIZE);
if (unnet == NULL) return(-1);
}
/* left over data from last decrypt */
if (unnet == NULL) return(-1);
}
/* left over data from last decrypt */