Fix a narrowing warning.

[libpcap] / sslutils.c

diff --git a/sslutils.c b/sslutils.c
index 637940a1ba5dcaee73aa99bdd1449e81537733f5..cde19137448b9a45a07d285fecda02273a3f144a 100644 (file)
--- a/sslutils.c
+++ b/sslutils.c
@@ -49,7 +49,7 @@ char ssl_rootfile[PATH_MAX];  //!< file containing the list of CAs trusted by th
 // TODO: lock?
 static SSL_CTX *ctx;
 
 // TODO: lock?
 static SSL_CTX *ctx;
 

-static int ssl_init_once(int is_server, char *errbuf, size_t errbuflen)
+static int ssl_init_once(int is_server, int enable_compression, char *errbuf, size_t errbuflen)

 {
        static int inited = 0;
        if (inited) return 0;
 {
        static int inited = 0;
        if (inited) return 0;


@@ -57,41 +57,30 @@ static int ssl_init_once(int is_server, char *errbuf, size_t errbuflen)
        SSL_library_init();
        SSL_load_error_strings();
        OpenSSL_add_ssl_algorithms();
        SSL_library_init();
        SSL_load_error_strings();
        OpenSSL_add_ssl_algorithms();

+       if (enable_compression)
+               SSL_COMP_get_compression_methods();

 
 

-<<<<<<< HEAD
-       SSL_METHOD const *meth = SSLv23_method();
+       SSL_METHOD const *meth =
+           is_server ? SSLv23_server_method() : SSLv23_client_method();

        ctx = SSL_CTX_new(meth);
        if (! ctx)
        {
        ctx = SSL_CTX_new(meth);
        if (! ctx)
        {

-=======
-       SSL_METHOD const *meth =
-               is_server ? SSLv23_server_method() : SSLv23_client_method();
-       ctx = SSL_CTX_new(meth);
-       if (! ctx) {
->>>>>>> b5063379... TLS for rpcap: also encrypt the control socket

                pcap_snprintf(errbuf, errbuflen, "Cannot get a new SSL context: %s", ERR_error_string(ERR_get_error(), NULL));
                goto die;
        }
 
        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
 
                pcap_snprintf(errbuf, errbuflen, "Cannot get a new SSL context: %s", ERR_error_string(ERR_get_error(), NULL));
                goto die;
        }
 
        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
 

-<<<<<<< HEAD

        if (is_server)
        {
                char const *certfile = ssl_certfile[0] ? ssl_certfile : "cert.pem";
                if (1 != SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
                {
        if (is_server)
        {
                char const *certfile = ssl_certfile[0] ? ssl_certfile : "cert.pem";
                if (1 != SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
                {

-=======
-       if (is_server) {
-               char const *certfile = ssl_certfile[0] ? ssl_certfile : "cert.pem";
-               if (1 != SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM)) {
->>>>>>> b5063379... TLS for rpcap: also encrypt the control socket

                        pcap_snprintf(errbuf, errbuflen, "Cannot read certificate file %s: %s", certfile, ERR_error_string(ERR_get_error(), NULL));
                        goto die;
                }
 
                char const *keyfile = ssl_keyfile[0] ? ssl_keyfile : "key.pem";
                        pcap_snprintf(errbuf, errbuflen, "Cannot read certificate file %s: %s", certfile, ERR_error_string(ERR_get_error(), NULL));
                        goto die;
                }
 
                char const *keyfile = ssl_keyfile[0] ? ssl_keyfile : "key.pem";

-<<<<<<< HEAD

                if (1 != SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))
                {
                        pcap_snprintf(errbuf, errbuflen, "Cannot read private key file %s: %s", keyfile, ERR_error_string(ERR_get_error(), NULL));
                if (1 != SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))
                {
                        pcap_snprintf(errbuf, errbuflen, "Cannot read private key file %s: %s", keyfile, ERR_error_string(ERR_get_error(), NULL));


@@ -110,40 +99,19 @@ static int ssl_init_once(int is_server, char *errbuf, size_t errbuflen)
                }
                else
                {
                }
                else
                {

-=======
-               if (1 != SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM)) {
-                       pcap_snprintf(errbuf, errbuflen, "Cannot read private key file %s: %s", keyfile, ERR_error_string(ERR_get_error(), NULL));
-                       goto die;
-               }
-       } else {
-               if (ssl_rootfile[0]) {
-                       if (! SSL_CTX_load_verify_locations(ctx, ssl_rootfile, 0)) {
-                               pcap_snprintf(errbuf, errbuflen, "Cannot read CA list from %s", ssl_rootfile);
-                               goto die;
-                       }
-               } else {
->>>>>>> b5063379... TLS for rpcap: also encrypt the control socket

                        SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
                }
        }
 
 #if 0
                        SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
                }
        }
 
 #if 0

-<<<<<<< HEAD

        if (! RAND_load_file(RANDOM, 1024*1024))
        {
        if (! RAND_load_file(RANDOM, 1024*1024))
        {

-=======
-       if (! RAND_load_file(RANDOM, 1024*1024)) {
->>>>>>> b5063379... TLS for rpcap: also encrypt the control socket

                pcap_snprintf(errbuf, errbuflen, "Cannot init random");
                goto die;
        }
 
                pcap_snprintf(errbuf, errbuflen, "Cannot init random");
                goto die;
        }
 

-<<<<<<< HEAD

        if (is_server)
        {
        if (is_server)
        {

-=======
-       if (is_server) {
->>>>>>> b5063379... TLS for rpcap: also encrypt the control socket

                SSL_CTX_set_session_id_context(ctx, (void *)&s_server_session_id_context, sizeof(s_server_session_id_context));
        }
 #endif
                SSL_CTX_set_session_id_context(ctx, (void *)&s_server_session_id_context, sizeof(s_server_session_id_context));
        }
 #endif


@@ -155,26 +123,20 @@ die:
        return -1;
 }
 
        return -1;
 }
 

-void init_ssl_or_die(int is_server)
+void init_ssl_or_die(int is_server, int enable_compression)

 {
        char errbuf[PCAP_ERRBUF_SIZE];
 
 {
        char errbuf[PCAP_ERRBUF_SIZE];
 

-<<<<<<< HEAD
-       if (ssl_init_once(is_server, errbuf, sizeof errbuf) < 0)
+       if (ssl_init_once(is_server, enable_compression, errbuf, sizeof errbuf) < 0)

        {
                fprintf(stderr, "%s\n", errbuf);
                exit(3);
        }
        {
                fprintf(stderr, "%s\n", errbuf);
                exit(3);
        }

-=======
-       if (ssl_init_once(is_server, errbuf, sizeof errbuf) < 0) {
-               fprintf(stderr, "%s\n", errbuf);
-               exit(3);
-       }

 }
 
 SSL *ssl_promotion_rw(int is_server, SOCKET in, SOCKET out, char *errbuf, size_t errbuflen)
 {
 }
 
 SSL *ssl_promotion_rw(int is_server, SOCKET in, SOCKET out, char *errbuf, size_t errbuflen)
 {

-       if (ssl_init_once(is_server, errbuf, errbuflen) < 0) {
+       if (ssl_init_once(is_server, 1, errbuf, errbuflen) < 0) {

                return NULL;
        }
 
                return NULL;
        }
 


@@ -197,7 +159,6 @@ SSL *ssl_promotion_rw(int is_server, SOCKET in, SOCKET out, char *errbuf, size_t
        }
 
        return ssl;
        }
 
        return ssl;

->>>>>>> b5063379... TLS for rpcap: also encrypt the control socket

 }
 
 SSL *ssl_promotion(int is_server, SOCKET s, char *errbuf, size_t errbuflen)
 }
 
 SSL *ssl_promotion(int is_server, SOCKET s, char *errbuf, size_t errbuflen)


@@ -207,7 +168,7 @@ SSL *ssl_promotion(int is_server, SOCKET s, char *errbuf, size_t errbuflen)
 
 // Same return value as sock_send:
 // 0 on OK, -1 on error but closed connection (-2).
 
 // Same return value as sock_send:
 // 0 on OK, -1 on error but closed connection (-2).

-int ssl_send(SSL *ssl, char const *buffer, size_t size, char *errbuf, size_t errbuflen)
+int ssl_send(SSL *ssl, char const *buffer, int size, char *errbuf, size_t errbuflen)

 {
        int status = SSL_write(ssl, buffer, size);
        if (status > 0)
 {
        int status = SSL_write(ssl, buffer, size);
        if (status > 0)


@@ -235,7 +196,7 @@ int ssl_send(SSL *ssl, char const *buffer, size_t size, char *errbuf, size_t err
 }
 
 // Returns the number of bytes read, or -1 on syserror, or -2 on SSL error.
 }
 
 // Returns the number of bytes read, or -1 on syserror, or -2 on SSL error.

-int ssl_recv(SSL *ssl, char *buffer, size_t size, char *errbuf, size_t errbuflen)
+int ssl_recv(SSL *ssl, char *buffer, int size, char *errbuf, size_t errbuflen)

 {
        int status = SSL_read(ssl, buffer, size);
        if (status <= 0)
 {
        int status = SSL_read(ssl, buffer, size);
        if (status <= 0)