CI: Call print_so_deps() on rpcapd in remote enabled build

[libpcap] / sslutils.c

diff --git a/sslutils.c b/sslutils.c
index c1aac9e4d0f039c2dfd835a7d23c1a9a9a2f0602..c75b53784bb9c384046d40281d1aa31243bfcccb 100644 (file)
--- a/sslutils.c
+++ b/sslutils.c
@@ -30,13 +30,13 @@
  *
  */
 
  *
  */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #ifdef HAVE_OPENSSL
 #include <stdlib.h>
 
 
 #ifdef HAVE_OPENSSL
 #include <stdlib.h>
 

+#include "portability.h"
+

 #include "sslutils.h"
 
 static const char *ssl_keyfile = "";   //!< file containing the private key in PEM format
 #include "sslutils.h"
 
 static const char *ssl_keyfile = "";   //!< file containing the private key in PEM format


@@ -73,7 +73,7 @@ int ssl_init_once(int is_server, int enable_compression, char *errbuf, size_t er
        ctx = SSL_CTX_new(meth);
        if (! ctx)
        {
        ctx = SSL_CTX_new(meth);
        if (! ctx)
        {

-               pcap_snprintf(errbuf, errbuflen, "Cannot get a new SSL context: %s", ERR_error_string(ERR_get_error(), NULL));
+               snprintf(errbuf, errbuflen, "Cannot get a new SSL context: %s", ERR_error_string(ERR_get_error(), NULL));

                goto die;
        }
 
                goto die;
        }
 


@@ -84,14 +84,14 @@ int ssl_init_once(int is_server, int enable_compression, char *errbuf, size_t er
                char const *certfile = ssl_certfile[0] ? ssl_certfile : "cert.pem";
                if (1 != SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
                {
                char const *certfile = ssl_certfile[0] ? ssl_certfile : "cert.pem";
                if (1 != SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
                {

-                       pcap_snprintf(errbuf, errbuflen, "Cannot read certificate file %s: %s", certfile, ERR_error_string(ERR_get_error(), NULL));
+                       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";
                if (1 != SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))
                {
                        goto die;
                }
 
                char const *keyfile = ssl_keyfile[0] ? ssl_keyfile : "key.pem";
                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));
+                       snprintf(errbuf, errbuflen, "Cannot read private key file %s: %s", keyfile, ERR_error_string(ERR_get_error(), NULL));

                        goto die;
                }
        }
                        goto die;
                }
        }


@@ -101,7 +101,7 @@ int ssl_init_once(int is_server, int enable_compression, char *errbuf, size_t er
                {
                        if (! SSL_CTX_load_verify_locations(ctx, 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);
+                               snprintf(errbuf, errbuflen, "Cannot read CA list from %s", ssl_rootfile);

                                goto die;
                        }
                }
                                goto die;
                        }
                }


@@ -114,7 +114,7 @@ int ssl_init_once(int is_server, int enable_compression, char *errbuf, size_t er
 #if 0
        if (! RAND_load_file(RANDOM, 1024*1024))
        {
 #if 0
        if (! RAND_load_file(RANDOM, 1024*1024))
        {

-               pcap_snprintf(errbuf, errbuflen, "Cannot init random");
+               snprintf(errbuf, errbuflen, "Cannot init random");

                goto die;
        }
 
                goto die;
        }
 


@@ -131,25 +131,24 @@ die:
        return -1;
 }
 
        return -1;
 }
 

-SSL *ssl_promotion_rw(int is_server, SOCKET in, SOCKET out, char *errbuf, size_t errbuflen)
+SSL *ssl_promotion(int is_server, PCAP_SOCKET s, char *errbuf, size_t errbuflen)

 {
        if (ssl_init_once(is_server, 1, errbuf, errbuflen) < 0) {
                return NULL;
        }
 
        SSL *ssl = SSL_new(ctx); // TODO: also a DTLS context
 {
        if (ssl_init_once(is_server, 1, errbuf, errbuflen) < 0) {
                return NULL;
        }
 
        SSL *ssl = SSL_new(ctx); // TODO: also a DTLS context

-       SSL_set_rfd(ssl, in);
-       SSL_set_wfd(ssl, out);
+       SSL_set_fd(ssl, (int)s);

 
        if (is_server) {
                if (SSL_accept(ssl) <= 0) {
 
        if (is_server) {
                if (SSL_accept(ssl) <= 0) {

-                       pcap_snprintf(errbuf, errbuflen, "SSL_accept(): %s",
+                       snprintf(errbuf, errbuflen, "SSL_accept(): %s",

                                        ERR_error_string(ERR_get_error(), NULL));
                        return NULL;
                }
        } else {
                if (SSL_connect(ssl) <= 0) {
                                        ERR_error_string(ERR_get_error(), NULL));
                        return NULL;
                }
        } else {
                if (SSL_connect(ssl) <= 0) {

-                       pcap_snprintf(errbuf, errbuflen, "SSL_connect(): %s",
+                       snprintf(errbuf, errbuflen, "SSL_connect(): %s",

                                        ERR_error_string(ERR_get_error(), NULL));
                        return NULL;
                }
                                        ERR_error_string(ERR_get_error(), NULL));
                        return NULL;
                }


@@ -158,9 +157,23 @@ SSL *ssl_promotion_rw(int is_server, SOCKET in, SOCKET out, char *errbuf, size_t
        return ssl;
 }
 
        return ssl;
 }
 

-SSL *ssl_promotion(int is_server, SOCKET s, char *errbuf, size_t errbuflen)
+// Finish using an SSL handle; shut down the connection and free the
+// handle.
+void ssl_finish(SSL *ssl)

 {
 {

-       return ssl_promotion_rw(is_server, s, s, errbuf, errbuflen);
+       //
+       // We won't be using this again, so we can just send the
+       // shutdown alert and free up the handle, and have our
+       // caller close the socket.
+       //
+       // XXX - presumably, if the connection is shut down on
+       // our side, either our peer won't have a problem sending
+       // their shutdown alert or will not treat such a problem
+       // as an error.  If this causes errors to be reported,
+       // fix that as appropriate.
+       //
+       SSL_shutdown(ssl);
+       SSL_free(ssl);

 }
 
 // Same return value as sock_send:
 }
 
 // Same return value as sock_send:


@@ -186,7 +199,7 @@ int ssl_send(SSL *ssl, char const *buffer, int size, char *errbuf, size_t errbuf
                        if (errno == ECONNRESET || errno == EPIPE) return -2;
 #endif
                }
                        if (errno == ECONNRESET || errno == EPIPE) return -2;
 #endif
                }

-               pcap_snprintf(errbuf, errbuflen, "SSL_write(): %s",
+               snprintf(errbuf, errbuflen, "SSL_write(): %s",

                    ERR_error_string(ERR_get_error(), NULL));
                return -1;
        }
                    ERR_error_string(ERR_get_error(), NULL));
                return -1;
        }


@@ -210,7 +223,7 @@ int ssl_recv(SSL *ssl, char *buffer, int size, char *errbuf, size_t errbuflen)
                else
                {
                        // Should not happen
                else
                {
                        // Should not happen

-                       pcap_snprintf(errbuf, errbuflen, "SSL_read(): %s",
+                       snprintf(errbuf, errbuflen, "SSL_read(): %s",

                            ERR_error_string(ERR_get_error(), NULL));
                        return -2;
                }
                            ERR_error_string(ERR_get_error(), NULL));
                        return -2;
                }