Commit 81cda63c authored by runge's avatar runge

fix some compiler warnings.

parent d400112c
x11vnc README file Date: Sat Feb 21 19:25:56 EST 2009
x11vnc README file Date: Sat Feb 21 21:51:04 EST 2009
The following information is taken from these URLs:
......
......@@ -2,6 +2,7 @@
#include "x11vnc.h"
#include "connections.h"
#include "cleanup.h"
void avahi_initialise(void);
void avahi_advertise(const char *name, const char *host, const uint16_t port);
......@@ -136,6 +137,10 @@ void avahi_cleanup(void) {
#include <avahi-client/client.h>
#include <avahi-client/publish.h>
#include <avahi-common/malloc.h>
#include <avahi-common/error.h>
static AvahiThreadedPoll *_poll = NULL;
static AvahiClient *_client = NULL;
static AvahiEntryGroup *_group = NULL;
......@@ -242,6 +247,8 @@ if (db) fprintf(stderr, "in _avahi_entry_group_callback %d 0x%p\n", state, svc)
avahi_strerror(avahi_client_errno(
avahi_entry_group_get_client(g))));
break;
default:
break;
}
if (db) fprintf(stderr, "out _avahi_entry_group_callback\n");
}
......
......@@ -591,7 +591,7 @@ static void enc_xfer(int sock_fr, int sock_to, int encrypt) {
EVP_CIPHER_CTX_init(ctx);
if (pw_in) {
/* for pw=xxxx a md5 hash is used */
EVP_BytesToKey(Cipher, Digest, NULL, keydata,
EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
keydata_len, 1, keystr, NULL);
EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, NULL,
encrypt);
......@@ -603,7 +603,7 @@ static void enc_xfer(int sock_fr, int sock_to, int encrypt) {
} else {
/* XXX might not be correct */
exit(1);
EVP_BytesToKey(Cipher, Digest, NULL, keydata,
EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
keydata_len, 1, keystr, ivec);
EVP_CIPHER_CTX_init(ctx);
EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, ivec,
......@@ -646,7 +646,7 @@ static void enc_xfer(int sock_fr, int sock_to, int encrypt) {
} else if (noultra && ivec_size > 0) {
/* "normal" mode, don't overwrite ivec. */
EVP_BytesToKey(Cipher, Digest, in_salt, keydata,
EVP_BytesToKey(Cipher, Digest, in_salt, (unsigned char *) keydata,
keydata_len, 1, keystr, NULL);
} else {
......@@ -655,7 +655,7 @@ static void enc_xfer(int sock_fr, int sock_to, int encrypt) {
* clobbers the ivec we set up above! Under
* noultra we overwrite ivec only if ivec_size=0.
*/
EVP_BytesToKey(Cipher, Digest, in_salt, keydata,
EVP_BytesToKey(Cipher, Digest, in_salt, (unsigned char *) keydata,
keydata_len, 1, keystr, ivec);
}
......
......@@ -4,6 +4,7 @@
#include "cleanup.h"
#include "connections.h"
#include "unixpw.h"
#include "win_utils.h"
#include "xwrappers.h"
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment