Merge tag 'release_3_0_1' into tr-integ

Conflicts:
	share/dictionary
	share/dictionary.freeradius.internal
	share/dictionary.ukerna
	src/main/realms.c
	src/modules/rlm_eap/libeap/all.mk
	src/modules/rlm_realm/rlm_realm.c

diff --cc raddb/mods-available/realm
Simple merge

diff --cc share/dictionary.freeradius.internal
index 63a3732,823c897..ee0db34
--- 1/share/dictionary.freeradius.internal
--- 2/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@@ -240,13 -240,10 +240,17 @@@ ATTRIBUTE       FreeRADIUS-Client-Src-IPv6-Ad
  
  ATTRIBUTE     OTP-Challenge                           1145    string
  ATTRIBUTE     EAP-Session-Id                          1146    octets
+ 
 +#     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
+ 
  #
  #     Range:  1200-1279
  #             EAP-SIM (and other EAP type) weirdness.
@@@ -471,12 -478,11 +485,12 @@@ ATTRIBUTE       TLS-Client-Cert-Common-Name             
  ATTRIBUTE     TLS-Client-Cert-Filename                1925    string
  ATTRIBUTE     TLS-Client-Cert-Subject-Alt-Name-Email  1926    string
  ATTRIBUTE     TLS-Client-Cert-X509v3-Extended-Key-Usage 1927  string
- ATTRIBUTE     TLS-Client-Cert-X509v3-Subject-Key-Identifier 1928 string
- ATTRIBUTE     TLS-Client-Cert-X509v3-Authority-Key-Identifier 1929 string
- ATTRIBUTE     TLS-Client-Cert-X509v3-Basic-Constraints 1930 string
+ ATTRIBUTE     TLS-Client-Cert-X509v3-Subject-Key-Identifier 1928      string
+ ATTRIBUTE     TLS-Client-Cert-X509v3-Authority-Key-Identifier 1929    string
+ ATTRIBUTE     TLS-Client-Cert-X509v3-Basic-Constraints 1930   string
 +ATTRIBUTE     TLS-PSK-Identity                        1931    string
  
 -# 1931 - 1939: reserved for future cert attributes
 +# 1932 - 1939: reserved for future cert attributes
  
  #
  #     Range:  1940-2099

diff --cc share/dictionary.ukerna
index adec403,c390b5b..89268dd
--- 1/share/dictionary.ukerna
--- 2/share/dictionary.ukerna
+++ b/share/dictionary.ukerna
@@@ -6,15 -6,10 +6,15 @@@
  #     $Id$
  #
  
- VENDOR        UKERNA                          25622
+ VENDOR                UKERNA                          25622
  
- BEGIN-VENDOR UKERNA
+ BEGIN-VENDOR  UKERNA
  
 -ATTRIBUTE     SAML-AAA-Assertion                      132     string
 +ATTRIBUTE     UKERNA-GSS-Acceptor-Service-Name        128     string
 +ATTRIBUTE     UKERNA-GSS-Acceptor-Host-Name           129     string
 +ATTRIBUTE     UKERNA-GSS-Acceptor-Service-Specific    130     string
 +ATTRIBUTE     Ukerna-GSS-Acceptor-Realm-Name          131     string
 +ATTRIBUTE     SAML-AAA-Assertion              132     string
 +ATTRIBUTE     EAP-Channel-Binding-Message     135     octets
  
  END-VENDOR UKERNA

diff --cc src/include/realms.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 2937574,c32fde5..1c7192b
--- 1/src/main/tls.c
--- 2/src/main/tls.c
+++ b/src/main/tls.c
@@@ -116,10 -79,10 +116,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(conf->psk_password, psk, psk_len);
+       return fr_hex2bin(psk, conf->psk_password, psk_len);
  }
  
  static unsigned int psk_client_callback(SSL *ssl, UNUSED char const *hint,

diff --cc src/modules/rlm_eap/libeap/all.mk
index db2237d,31e8a30..6a32129
--- 1/src/modules/rlm_eap/libeap/all.mk
--- 2/src/modules/rlm_eap/libeap/all.mk
+++ b/src/modules/rlm_eap/libeap/all.mk
@@@ -1,6 -1,6 +1,6 @@@
  TARGET := libfreeradius-eap.a
  
- SOURCES       := eapcommon.c eapcrypto.c eap_chbind.c eapsimlib.c fips186prf.c
 -SOURCES       := eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c comp128.c
++SOURCES       := eapcommon.c eapcrypto.c eap_chbind.c eapsimlib.c fips186prf.c comp128.c
  ifneq (${OPENSSL_LIBS},)
  SOURCES               += eap_tls.c mppe_keys.c
  endif

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/types/rlm_eap_ttls/ttls.c
index 16c1cfe,859b0e4..6c1f12f
--- 1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
--- 2/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@@ -958,11 -922,9 +949,11 @@@ int eapttls_process(eap_handler_t *hand
        REQUEST *fake;
        VALUE_PAIR *vp;
        ttls_tunnel_t *t;
-       const uint8_t *data;
+       uint8_t const *data;
        size_t data_len;
        REQUEST *request = handler->request;
 +      eap_chbind_packet_t *chbind_packet;
 +      size_t chbind_len;
  
        rad_assert(request != NULL);
  

diff --cc src/modules/rlm_realm/rlm_realm.c
index 55b8ca1,bdc462c..67b3c73
--- 1/src/modules/rlm_realm/rlm_realm.c
--- 2/src/modules/rlm_realm/rlm_realm.c
+++ b/src/modules/rlm_realm/rlm_realm.c
@@@ -32,13 -30,10 +32,13 @@@ RCSID("$Id$"
  
  typedef struct realm_config_t {
        int     format;
 -      char    *formatstring;
 -      char    *delim;
 +      char       *formatstring;
 +      char       *delim;
-       int     ignore_default;
-       int     ignore_null;
+       bool    ignore_default;
+       bool    ignore_null;
 +  char             *default_community;
 +  char       *rp_realm;
 +  char       *trust_router;
  } realm_config_t;
  
  static CONF_PARSER module_config[] = {