openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix gcc warnings.

This commit is contained in:
Ulf Möller 2000-02-20 20:59:21 +00:00
parent d754b3850f
commit 4ec19e203c
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/passwd.c
View File

@ -20,7 +20,7 @@
# include <openssl/des.h>
#endif
#ifndef NO_APR1
# include <openssl/des.h>
# include <openssl/md5.h>
#endif
@ -323,13 +323,13 @@ static char *apr1_crypt(const char *passwd, const char *salt)
MD5_CTX md2;
MD5_Init(&md2);
MD5_Update(&md2, (i & 1) ? passwd : buf,
MD5_Update(&md2, (i & 1) ? (unsigned char *) passwd : buf,
(i & 1) ? passwd_len : sizeof buf);
if (i % 3)
MD5_Update(&md2, salt_out, salt_len);
if (i % 7)
MD5_Update(&md2, passwd, passwd_len);
MD5_Update(&md2, (i & 1) ? buf : passwd,
MD5_Update(&md2, (i & 1) ? buf : (unsigned char *) passwd,
(i & 1) ? sizeof buf : passwd_len);
MD5_Final(buf, &md2);
}

1
apps/s_client.c
View File

@ -508,6 +508,7 @@ re_start:
* are any keypresses. Note: this is a hack, in a proper
* Windows application we wouldn't do this.
*/
i=0;
if(!write_tty) {
if(read_tty) {
tv.tv_sec = 1;

3
crypto/bio/bss_log.c
View File

@ -133,11 +133,10 @@ static int MS_CALLBACK slg_write(BIO *b, char *in, int inl)
char* buf= in;
char* pp;
#if defined(WIN32)
LPTSTR lpszStrings[2];
LPCSTR lpszStrings[2];
WORD evtype= EVENTLOG_ERROR_TYPE;
int pid = _getpid();
char pidbuf[20];
int pidbufl;
#else
int priority;
#endif

2
doc/crypto/EVP_DigestInit.pod
View File

@ -115,7 +115,7 @@ EVP_md_null(), EVP_MD *EVP_md2(), EVP_MD *EVP_md5(), EVP_MD *EVP_sha(),
EVP_sha1(), EVP_dss(), EVP_dss1(), EVP_mdc2() and EVP_ripemd160() return
pointers to the corresponding EVP_MD structures.
B<EVP_get_digestbyname>, B<EVP_get_digestbynid> and B<EVP_get_digestbyobj>
EVP_get_digestbyname(), EVP_get_digestbynid() and EVP_get_digestbyobj()
return either an B<EVP_MD> structure or NULL if an error occurs.
=head1 NOTES

13
util/libeay.num
View File

@ -1304,13 +1304,12 @@ i2d_SXNETID 1329
d2i_SXNETID 1330
SXNETID_new 1331
SXNETID_free 1332
DSA_SIG_new 1333
DSA_SIG_free 1334
DSA_do_sign 1335
DSA_do_verify 1336
d2i_DSA_SIG 1337
i2d_DSA_SIG 1338
DSA_SIG_new 1333
DSA_SIG_free 1334
DSA_do_sign 1335
DSA_do_verify 1336
d2i_DSA_SIG 1337
i2d_DSA_SIG 1338
i2d_ASN1_VISIBLESTRING 1339
d2i_ASN1_VISIBLESTRING 1340
i2d_ASN1_UTF8STRING 1341