Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade

Conflicts:
	src/include/realms.h
	src/main/realms.c
	src/main/tls.c
	src/modules/rlm_eap/libeap/eap_chbind.c
	src/modules/rlm_eap/libeap/eap_chbind.h
	src/modules/rlm_eap/radeapclient.c
	src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c

diff --cc share/dictionary.freeradius.internal
index ccdf43d,48f507a..35a4526
--- 1/share/dictionary.freeradius.internal
--- 2/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@@ -241,14 -241,13 +241,20 @@@ VALUE   Cache-Read-Only                 yes                     
  
  ATTRIBUTE     OTP-Challenge                           1145    string
  ATTRIBUTE     EAP-Session-Id                          1146    octets
+ ATTRIBUTE     Chbind-Response-Code                    1147    integer
+ 
+ ATTRIBUTE     Chbind-Response-Code                    1147    integer
+ 
+ VALUE Chbind-Response-Code            success                 2
+ VALUE Chbind-Response-Code            failure                 3
  
 +#     For EAP channel binding
 +
 +ATTRIBUTE     Chbind-Response-Code                    1147    integer
 +
 +VALUE Chbind-Response-Code            success                 2
 +VALUE Chbind-Response-Code            failure                 3
 +
  ATTRIBUTE     Acct-Input-Octets64                     1148    integer64
  ATTRIBUTE     Acct-Output-Octets64                    1149    integer64
  

diff --cc src/include/radius.h
Simple merge

diff --cc src/include/tls-h
Simple merge

diff --cc src/main/realms.c
Simple merge

diff --cc src/main/tls.c
index c44122e,50b1edc..d00eaeb
--- 1/src/main/tls.c
--- 2/src/main/tls.c
+++ b/src/main/tls.c
@@@ -135,10 -170,10 +170,10 @@@ static unsigned int psk_server_callback
                return 0;
        }
  
 -      psk_len = strlen(conf->psk_password);
 +              psk_len = strlen(conf->psk_password);
        if (psk_len > (2 * max_psk_len)) return 0;
  
-       return fr_hex2bin(psk, conf->psk_password, psk_len);
+       return fr_hex2bin(psk, max_psk_len, conf->psk_password, psk_len);
  }
  
  static unsigned int psk_client_callback(SSL *ssl, UNUSED char const *hint,
@@@ -2036,7 -2070,7 +2070,7 @@@ void tls_global_cleanup(void
   *    - Load the Private key & the certificate
   *    - Set the Context options & Verify options
   */
-  SSL_CTX *tls_init_ctx(fr_tls_server_conf_t *conf, int client)
 -static SSL_CTX *tls_init_ctx(fr_tls_server_conf_t *conf, int client)
++SSL_CTX *tls_init_ctx(fr_tls_server_conf_t *conf, int client)
  {
        SSL_CTX *ctx;
        X509_STORE *certstore;
@@@ -2143,22 -2197,9 +2197,22 @@@
                return NULL;
        }
  
 +      /*
 +       * There are two ways PSKs can be configured for a server. The
 +       * first is the same as a client: psk_identity and
 +       * psk_hexphrase. The second is to dynamically configure PSKs
 +       * and to have the psk_xlat return them. The second is
 +       * compatible with certificates; either the PSK or cert will
 +       * be used depending on what the client uses.
 +       */
 +      if (!client)
 +              SSL_CTX_set_psk_server_callback(ctx,
 +                                              psk_server_callback);
 +
 +
        if (conf->psk_identity) {
                size_t psk_len, hex_len;
-               char buffer[PSK_MAX_PSK_LEN];
+               uint8_t buffer[PSK_MAX_PSK_LEN];
  
                if (conf->certificate_file ||
                    conf->private_key_password || conf->private_key_file ||

diff --cc src/main/tls_listen.c
Simple merge

diff --cc src/modules/rlm_eap/libeap/eap_types.h
Simple merge

diff --cc src/modules/rlm_eap/libeap/eapcommon.c
Simple merge

diff --cc src/modules/rlm_eap/radeapclient.c
Simple merge

diff --cc src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
Simple merge

diff --cc src/modules/rlm_realm/rlm_realm.c
Simple merge