sbr/mts.c: Make MMDF's delimeters fixed at compile time.

[nmh] / sbr / netsec.c

diff --git a/sbr/netsec.c b/sbr/netsec.c
index b8806a17c37f426acca1f1036f22d7315c1ecc0e..a64743aa5decd853c57a6c8ceb848c22aa7548f8 100644 (file)
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -1,6 +1,4 @@
-
-/*
- * netsec.c -- Network security routines for handling protocols that
+/* netsec.c -- Network security routines for handling protocols that

  *            require SASL and/or TLS.
  *
  * This code is Copyright (c) 2016, by the authors of nmh.  See the
  *            require SASL and/or TLS.
  *
  * This code is Copyright (c) 2016, by the authors of nmh.  See the


@@ -393,7 +391,7 @@ netsec_read(netsec_context *nsc, void *buffer, size_t size, char **errstr)
      * assume here that this has something in it.
      */
 
      * assume here that this has something in it.
      */
 

-    retlen = size > nsc->ns_inbuflen ? nsc->ns_inbuflen : size;
+    retlen = min(size, nsc->ns_inbuflen);

 
     memcpy(buffer, nsc->ns_inptr, retlen);
 
 
     memcpy(buffer, nsc->ns_inptr, retlen);
 


@@ -1011,14 +1009,13 @@ netsec_set_sasl_params(netsec_context *nsc, const char *service,
     nsc->sasl_creds = nmh_get_credentials(nsc->ns_hostname, nsc->ns_userid);
 
 #else /* CYRUS_SASL */
     nsc->sasl_creds = nmh_get_credentials(nsc->ns_hostname, nsc->ns_userid);
 
 #else /* CYRUS_SASL */

-    NMH_UNUSED(hostname);

     NMH_UNUSED(service);
     NMH_UNUSED(errstr);
 #endif /* CYRUS_SASL */
 
     /*
      * According to the RFC, mechanisms can only be uppercase letter, numbers,
     NMH_UNUSED(service);
     NMH_UNUSED(errstr);
 #endif /* CYRUS_SASL */
 
     /*
      * According to the RFC, mechanisms can only be uppercase letter, numbers,

-     * and a hypen or underscore.  So make sure we uppercase any letters
+     * and a hyphen or underscore.  So make sure we uppercase any letters

      * in case the user passed in lowercase.
      */
 
      * in case the user passed in lowercase.
      */
 


@@ -1438,7 +1435,7 @@ netsec_set_tls(netsec_context *nsc, int tls, int noverify, char **errstr)
 #ifdef TLS_SUPPORT
     if (tls) {
        SSL *ssl;
 #ifdef TLS_SUPPORT
     if (tls) {
        SSL *ssl;

-       BIO *rbio, *wbio, *ssl_bio;;
+        BIO *rbio, *wbio, *ssl_bio;

 
        if (! tls_initialized) {
            SSL_library_init();
 
        if (! tls_initialized) {
            SSL_library_init();


@@ -1543,7 +1540,9 @@ netsec_set_tls(netsec_context *nsc, int tls, int noverify, char **errstr)
         */
 
        if (! noverify) {
         */
 
        if (! noverify) {

+#ifdef HAVE_X509_VERIFY_PARAM_SET1_HOST

            X509_VERIFY_PARAM *param;
            X509_VERIFY_PARAM *param;

+#endif /* HAVE_X509_VERIFY_PARAM_SET1_HOST */

 
            SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL);
            if (! nsc->ns_hostname) {
 
            SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL);
            if (! nsc->ns_hostname) {


@@ -1553,6 +1552,7 @@ netsec_set_tls(netsec_context *nsc, int tls, int noverify, char **errstr)
                return NOTOK;
            }
 
                return NOTOK;
            }
 

+#ifdef HAVE_X509_VERIFY_PARAM_SET1_HOST

            param = SSL_get0_param(ssl);
 
            if (! X509_VERIFY_PARAM_set1_host(param, nsc->ns_hostname, 0)) {
            param = SSL_get0_param(ssl);
 
            if (! X509_VERIFY_PARAM_set1_host(param, nsc->ns_hostname, 0)) {


@@ -1562,6 +1562,7 @@ netsec_set_tls(netsec_context *nsc, int tls, int noverify, char **errstr)
                SSL_free(ssl);
                return NOTOK;
            }
                SSL_free(ssl);
                return NOTOK;
            }

+#endif /* HAVE_X509_VERIFY_PARAM_SET1_HOST */

        }
 
        ssl_bio = BIO_new(BIO_f_ssl());
        }
 
        ssl_bio = BIO_new(BIO_f_ssl());