Codebase list freeradius / 59d9b59
refresh patches Michael Stapelberg 6 years ago
4 changed file(s) with 52 addition(s) and 52 deletion(s). Raw diff Collapse all Expand all
+4
-4
debian/patches/disable-session-cache-CVE-2017-9148.patch less more
1010 ===================================================================
1111 --- freeradius.orig/src/main/tls.c
1212 +++ freeradius/src/main/tls.c
13 @@ -579,7 +579,7 @@ tls_session_t *tls_new_session(TALLOC_CT
13 @@ -594,7 +594,7 @@ tls_session_t *tls_new_session(TALLOC_CT
1414 *
1515 * FIXME: Also do it every N sessions?
1616 */
1919 ((conf->session_last_flushed + ((int)conf->session_timeout * 1800)) <= request->timestamp)){
2020 RDEBUG2("Flushing SSL sessions (of #%ld)", SSL_CTX_sess_number(conf->ctx));
2121
22 @@ -674,7 +674,7 @@ tls_session_t *tls_new_session(TALLOC_CT
22 @@ -689,7 +689,7 @@ tls_session_t *tls_new_session(TALLOC_CT
2323 state->mtu = vp->vp_integer;
2424 }
2525
2828
2929 return state;
3030 }
31 @@ -2848,7 +2848,7 @@ post_ca:
31 @@ -2991,7 +2991,7 @@ post_ca:
3232 /*
3333 * Callbacks, etc. for session resumption.
3434 */
3737 /*
3838 * Cache sessions on disk if requested.
3939 */
40 @@ -2916,7 +2916,7 @@ post_ca:
40 @@ -3059,7 +3059,7 @@ post_ca:
4141 /*
4242 * Setup session caching
4343 */
+3
-3
debian/patches/mkdirp.diff less more
44
55 ---
66
7 Index: freeradius-new/install-sh
7 Index: freeradius/install-sh
88 ===================================================================
9 --- freeradius-new.orig/install-sh
10 +++ freeradius-new/install-sh
9 --- freeradius.orig/install-sh
10 +++ freeradius/install-sh
1111 @@ -1,251 +1,501 @@
1212 #!/bin/sh
1313 -#
+15
-15
debian/patches/snakeoil-certs.diff less more
44
55 ---
66
7 Index: freeradius-new/raddb/mods-available/eap
7 Index: freeradius/raddb/mods-available/eap
88 ===================================================================
9 --- freeradius-new.orig/raddb/mods-available/eap
10 +++ freeradius-new/raddb/mods-available/eap
9 --- freeradius.orig/raddb/mods-available/eap
10 +++ freeradius/raddb/mods-available/eap
1111 @@ -171,7 +171,7 @@ eap {
1212 # authenticate via EAP-TLS! This is likely not what you want.
1313 tls-config tls-common {
3535
3636 # OpenSSL will automatically create certificate chains,
3737 # unless we tell it to not do that. The problem is that
38 Index: freeradius-new/raddb/mods-available/inner-eap
38 Index: freeradius/raddb/mods-available/inner-eap
3939 ===================================================================
40 --- freeradius-new.orig/raddb/mods-available/inner-eap
41 +++ freeradius-new/raddb/mods-available/inner-eap
40 --- freeradius.orig/raddb/mods-available/inner-eap
41 +++ freeradius/raddb/mods-available/inner-eap
4242 @@ -50,7 +50,7 @@ eap inner-eap {
4343 #
4444 tls {
6262
6363 cipher_list = "DEFAULT"
6464
65 Index: freeradius-new/raddb/sites-available/abfab-tls
65 Index: freeradius/raddb/sites-available/abfab-tls
6666 ===================================================================
67 --- freeradius-new.orig/raddb/sites-available/abfab-tls
68 +++ freeradius-new/raddb/sites-available/abfab-tls
67 --- freeradius.orig/raddb/sites-available/abfab-tls
68 +++ freeradius/raddb/sites-available/abfab-tls
6969 @@ -13,9 +13,9 @@ listen {
7070 private_key_password = whatever
7171
7979 dh_file = ${certdir}/dh
8080 fragment_size = 8192
8181 ca_path = ${cadir}
82 Index: freeradius-new/raddb/sites-available/tls
82 Index: freeradius/raddb/sites-available/tls
8383 ===================================================================
84 --- freeradius-new.orig/raddb/sites-available/tls
85 +++ freeradius-new/raddb/sites-available/tls
84 --- freeradius.orig/raddb/sites-available/tls
85 +++ freeradius/raddb/sites-available/tls
8686 @@ -82,7 +82,7 @@ listen {
8787 #
8888 tls {
110110
111111 #
112112 # For DH cipher suites to work, you have to
113 @@ -377,7 +377,7 @@ home_server tls {
113 @@ -383,7 +383,7 @@ home_server tls {
114114
115115 tls {
116116 private_key_password = whatever
119119
120120 # If Private key & Certificate are located in
121121 # the same file, then private_key_file &
122 @@ -389,7 +389,7 @@ home_server tls {
122 @@ -395,7 +395,7 @@ home_server tls {
123123 # only the server certificate, but ALSO all
124124 # of the CA certificates used to sign the
125125 # server certificate.
128128
129129 # Trusted Root CA list
130130 #
131 @@ -406,7 +406,7 @@ home_server tls {
131 @@ -412,7 +412,7 @@ home_server tls {
132132 # not use client certificates, and you do not want
133133 # to permit EAP-TLS authentication, then delete
134134 # this configuration item.
+30
-30
debian/patches/spelling-fixes.diff less more
33
44 ---
55
6 Index: freeradius-new/src/lib/debug.c
6 Index: freeradius/src/lib/debug.c
77 ===================================================================
8 --- freeradius-new.orig/src/lib/debug.c
9 +++ freeradius-new/src/lib/debug.c
8 --- freeradius.orig/src/lib/debug.c
9 +++ freeradius/src/lib/debug.c
1010 @@ -732,7 +732,7 @@ NEVER_RETURNS void fr_fault(int sig)
1111 if (disable) {
1212 FR_FAULT_LOG("Resetting PR_DUMPABLE to 0");
1616 FR_FAULT_LOG("Exiting due to insecure process state");
1717 fr_exit_now(1);
1818 }
19 Index: freeradius-new/src/modules/proto_dhcp/dhcpd.c
19 Index: freeradius/src/modules/proto_dhcp/dhcpd.c
2020 ===================================================================
21 --- freeradius-new.orig/src/modules/proto_dhcp/dhcpd.c
22 +++ freeradius-new/src/modules/proto_dhcp/dhcpd.c
21 --- freeradius.orig/src/modules/proto_dhcp/dhcpd.c
22 +++ freeradius/src/modules/proto_dhcp/dhcpd.c
2323 @@ -661,7 +661,7 @@ static int dhcp_socket_parse(CONF_SECTIO
2424 }
2525
2929 fr_syserror(errno));
3030 return -1;
3131 }
32 Index: freeradius-new/man/man5/dictionary.5
32 Index: freeradius/man/man5/dictionary.5
3333 ===================================================================
34 --- freeradius-new.orig/man/man5/dictionary.5
35 +++ freeradius-new/man/man5/dictionary.5
34 --- freeradius.orig/man/man5/dictionary.5
35 +++ freeradius/man/man5/dictionary.5
3636 @@ -35,7 +35,7 @@ break your RADIUS deployment.
3737 .PP
3838 If you need to add new attributes, please edit the
4242
4343 .SH FORMAT
4444 Every line starting with a hash sign
45 Index: freeradius-new/man/man5/radrelay.conf.5
45 Index: freeradius/man/man5/radrelay.conf.5
4646 ===================================================================
47 --- freeradius-new.orig/man/man5/radrelay.conf.5
48 +++ freeradius-new/man/man5/radrelay.conf.5
47 --- freeradius.orig/man/man5/radrelay.conf.5
48 +++ freeradius/man/man5/radrelay.conf.5
4949 @@ -134,7 +134,7 @@ running as radrelay. Please edit \fBrad
5050 The original "radrelay" program was written by Miquel van Smoorenburg
5151 for the Cistron radius project, and ported to FreeRADIUS by Simon
5555 a basis for the design of this implementation.
5656 .PP
5757 .SH FILES
58 Index: freeradius-new/man/man5/unlang.5
58 Index: freeradius/man/man5/unlang.5
5959 ===================================================================
60 --- freeradius-new.orig/man/man5/unlang.5
61 +++ freeradius-new/man/man5/unlang.5
60 --- freeradius.orig/man/man5/unlang.5
61 +++ freeradius/man/man5/unlang.5
6262 @@ -146,7 +146,7 @@ No statement other than "case" can appea
6363 .IP case
6464 .br
6868
6969 A "case" statement cannot appear outside of a "switch" block.
7070
71 @@ -397,7 +397,7 @@ conditions
71 @@ -398,7 +398,7 @@ conditions
7272 (foo)
7373 .DE
7474
7777 quotes, or back-quoted). Also evaluates to true if 'foo' is a
7878 non-zero number. Note that the language is poorly typed, so the
7979 string "0000" can be interpreted as a numerical zero. This issue can
80 @@ -419,7 +419,7 @@ codes are given in MODULE RETURN CODES,
80 @@ -420,7 +420,7 @@ codes are given in MODULE RETURN CODES,
8181 (!foo)
8282 .DE
8383
8686 .PP
8787 Short-circuit operators
8888 .RS
89 @@ -480,7 +480,7 @@ We recommend using attribute references
89 @@ -481,7 +481,7 @@ We recommend using attribute references
9090 attributes to a string, e.g. (User-Name == "%{Filter-Id}").
9191 Attribute references will be faster and more efficient.
9292
9595 If there is more than one instance of an attribute, the following
9696 syntax should be used:
9797
98 @@ -599,7 +599,7 @@ The trailing 'm' is also optional, and i
98 @@ -600,7 +600,7 @@ The trailing 'm' is also optional, and i
9999 and dollar '$' anchors should match on new lines as well as at the
100100 start and end of the subject string.
101101
104104 expression will define variables containing the matching text, as
105105 described below in the VARIABLES section.
106106 .SH EXPANSIONS
107 @@ -677,19 +677,19 @@ The integer value of the Attribute-Name,
107 @@ -678,19 +678,19 @@ The integer value of the Attribute-Name,
108108 name.
109109
110110 e.g. If a request contains "Service-Type = Login-User", the expansion
127127
128128 .IP %{Attribute-Name[*]}
129129 All values of Attribute-Name, concatenated together with ',' as the
130 @@ -775,7 +775,7 @@ no attribute exists, it is added with th
131
132 This operator is valid only for attributes of integer type.
130 @@ -785,7 +785,7 @@ given here. Any smaller value is replac
131 no attribute exists, it is added with the value given here, as with
132 "+=".
133133 .IP !*
134134 -Delete all occurances of the named attribute, no matter what the
135135 +Delete all occurrences of the named attribute, no matter what the
136136 value.
137137 .IP =~
138138 Keep all attributes having values which match the given regular
139 Index: freeradius-new/src/modules/rlm_krb5/rlm_krb5.c
139 Index: freeradius/src/modules/rlm_krb5/rlm_krb5.c
140140 ===================================================================
141 --- freeradius-new.orig/src/modules/rlm_krb5/rlm_krb5.c
142 +++ freeradius-new/src/modules/rlm_krb5/rlm_krb5.c
141 --- freeradius.orig/src/modules/rlm_krb5/rlm_krb5.c
142 +++ freeradius/src/modules/rlm_krb5/rlm_krb5.c
143143 @@ -171,7 +171,7 @@ static int mod_instantiate(CONF_SECTION
144144 ret = krb5_get_init_creds_opt_alloc(inst->context, &(inst->gic_options)); /* For some reason the 'init' version
145145 of this function is deprecated */
149149 rlm_krb5_error(inst->context, ret));
150150
151151 return -1;
152 Index: freeradius-new/src/modules/rlm_mschap/rlm_mschap.c
152 Index: freeradius/src/modules/rlm_mschap/rlm_mschap.c
153153 ===================================================================
154 --- freeradius-new.orig/src/modules/rlm_mschap/rlm_mschap.c
155 +++ freeradius-new/src/modules/rlm_mschap/rlm_mschap.c
156 @@ -1920,7 +1920,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
154 --- freeradius.orig/src/modules/rlm_mschap/rlm_mschap.c
155 +++ freeradius/src/modules/rlm_mschap/rlm_mschap.c
156 @@ -1922,7 +1922,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
157157 if (inst->with_ntdomain_hack) {
158158 username_string++;
159159 } else {