Commits · f68e2921bcf43b32fac3bca054ab0472579b7942 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

Aug 28, 2011

Better safe than sorry: with OpenSSL 1.0, X509_STORE_CTX_get_current_cert() · f68e2921

Kaspar Brand authored Aug 28, 2011

may not always return a cert.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162553 13f79535-47bb-0310-9956-ffa450edef68

f68e2921

Fix the default OCSP responder timeout for client cert · 8752bf47

Kaspar Brand authored Aug 28, 2011

validation - 10 µsec is a tad too aggressive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162552 13f79535-47bb-0310-9956-ffa450edef68

8752bf47

Aug 27, 2011

merge some more adjacent ranges such as a-n,n+1-b, and · efb10270

Eric Covener authored Aug 27, 2011

refactor/reduce the tests on the start/end positions.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162440 13f79535-47bb-0310-9956-ffa450edef68

efb10270

reverting. got feedback that maybe we don't want to merge 4-5,1-2 into 1-5 · c5a97a06
Greg Ames authored Aug 27, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162436 13f79535-47bb-0310-9956-ffa450edef68
```
c5a97a06

merge totally reversed ranges like 4-5,1-2 into 1-5 · 2f01f6ff

Greg Ames authored Aug 27, 2011

I interpret the former test
if (!(end <= ostart || start-1 >= oend)) {

as

if (not(end is bad || start is good)) { merge }

ORing the bad condition with the good doesn't produce the desired result.

it is not necessary to test "end" due to the conditions tested in the assert.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162434 13f79535-47bb-0310-9956-ffa450edef68

2f01f6ff

fix typo · ba010068

Stefan Fritsch authored Aug 27, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162419 13f79535-47bb-0310-9956-ffa450edef68

ba010068

remove obsolete macro · de45d5b5

Stefan Fritsch authored Aug 27, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162381 13f79535-47bb-0310-9956-ffa450edef68

de45d5b5

Updates. · 4d283bed

Lucien Gentis authored Aug 27, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162376 13f79535-47bb-0310-9956-ffa450edef68

4d283bed

If the sum of all ranges in a request is not smaller than the file, fall back · b0bad2da

Stefan Fritsch authored Aug 27, 2011

to 200. This takes care of potential DoS issues from ranges like
0-100,1000-,0-100,1000-,...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162331 13f79535-47bb-0310-9956-ffa450edef68

b0bad2da

fix function name in log message · 064786d9

Stefan Fritsch authored Aug 27, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162325 13f79535-47bb-0310-9956-ffa450edef68

064786d9

Aug 26, 2011

Remove traces of byterange_ctx, it's not necessary anymore · b4df3a35

Stefan Fritsch authored Aug 26, 2011

Initialize some variables to avoid (false positive) warnings with gcc 4.6.1


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162211 13f79535-47bb-0310-9956-ffa450edef68

b4df3a35

not ruby · 0036d6fd

Jim Jagielski authored Aug 26, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162186 13f79535-47bb-0310-9956-ffa450edef68

0036d6fd

Final tuneage · 8236257d

Jim Jagielski authored Aug 26, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162180 13f79535-47bb-0310-9956-ffa450edef68

8236257d

one off · 3a4171ff

Jim Jagielski authored Aug 26, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162179 13f79535-47bb-0310-9956-ffa450edef68

3a4171ff

remove merge hit r1161778 · 234bb5c4

Jim Jagielski authored Aug 26, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162168 13f79535-47bb-0310-9956-ffa450edef68

234bb5c4

More merge fixes... · f422e35e

Jim Jagielski authored Aug 26, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162165 13f79535-47bb-0310-9956-ffa450edef68

f422e35e

Reset with latest · 1514e64b

Jim Jagielski authored Aug 26, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162131 13f79535-47bb-0310-9956-ffa450edef68

1514e64b

* Don't SEGFAULT if SSLProxyMachineCertificateChainFile is not set. Just skip... · 4fe69a70

Ruediger Pluem authored Aug 26, 2011

* Don't SEGFAULT if SSLProxyMachineCertificateChainFile is not set. Just skip the additional lookups in this case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162103 13f79535-47bb-0310-9956-ffa450edef68

4fe69a70

Aug 25, 2011

Put parsed ranges into an array and perform merges on that array. · fc3b8852
Stefan Fritsch authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161791 13f79535-47bb-0310-9956-ffa450edef68
```
fc3b8852

count ranges by simply counting commas · b4201233

Stefan Fritsch authored Aug 25, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161790 13f79535-47bb-0310-9956-ffa450edef68

b4201233

Remove the merging code from ap_set_byterange() again, · 389a0fb1

Stefan Fritsch authored Aug 25, 2011

will move it to ap_byterange_filter


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161789 13f79535-47bb-0310-9956-ffa450edef68

389a0fb1

fix new breakage introduced by r1161767 · d52c6998

Stefan Fritsch authored Aug 25, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161778 13f79535-47bb-0310-9956-ffa450edef68

d52c6998

avoid inserting the same bucket into bbout twice, causing an endless loop · a11b1463
Stefan Fritsch authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161767 13f79535-47bb-0310-9956-ffa450edef68
```
a11b1463

0 is OK · 62484cb8

Jim Jagielski authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161732 13f79535-47bb-0310-9956-ffa450edef68

62484cb8

no longer used · 30cbc29f

Greg Ames authored Aug 25, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161730 13f79535-47bb-0310-9956-ffa450edef68

30cbc29f

Save a few cycles... do reason to set in_merge if we already have · 8f501285
Jim Jagielski authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161682 13f79535-47bb-0310-9956-ffa450edef68
```
8f501285

Optimize... and break if we get eg 200-100 · 8690cb10

Jim Jagielski authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161681 13f79535-47bb-0310-9956-ffa450edef68

8690cb10

Merge in byteranges · 931c384a

Jim Jagielski authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161661 13f79535-47bb-0310-9956-ffa450edef68

931c384a

* Once the comparsion is true we never return here since we break from the loop. · 380fbe27
Ruediger Pluem authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161582 13f79535-47bb-0310-9956-ffa450edef68
```
380fbe27

* We need to use > instead of >= as if end64 is the first byte of the next · da4eb161

Ruediger Pluem authored Aug 25, 2011

  bucket we need to memorize this one and not the one before.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161581 13f79535-47bb-0310-9956-ffa450edef68

da4eb161

* The first condition is not needed as pos >=0. If the first one is true · 812d4596

Ruediger Pluem authored Aug 25, 2011

the second one is true either. If the second one is false the first one is
false as well.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161578 13f79535-47bb-0310-9956-ffa450edef68

812d4596

* Adjust comment and don't get fooled by a negative end · 59095d75

Ruediger Pluem authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161576 13f79535-47bb-0310-9956-ffa450edef68

59095d75

* As reads might have morphed the bucket and its length read until we reached · 430d9ca0

Ruediger Pluem authored Aug 25, 2011

  the correct bucket for splitting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161573 13f79535-47bb-0310-9956-ffa450edef68

430d9ca0

Remove some merging fun between Rüdiger and my patches ;) · 378bcdf5
Jim Jagielski authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161563 13f79535-47bb-0310-9956-ffa450edef68
```
378bcdf5

simple name change for clarity · 51703b53

Jim Jagielski authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161560 13f79535-47bb-0310-9956-ffa450edef68

51703b53

More casting help... · ea75efdf

Jim Jagielski authored Aug 25, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161556 13f79535-47bb-0310-9956-ffa450edef68

ea75efdf

* Remove duplicate condition · ef8c0695

Ruediger Pluem authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161552 13f79535-47bb-0310-9956-ffa450edef68

ef8c0695

* Use apr_uint64_t throughout instead of mixing apr_off_t and apr_size_t · 588b8f8e
Ruediger Pluem authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161551 13f79535-47bb-0310-9956-ffa450edef68
```
588b8f8e

first round of cleanups · 9c3814ad

Jim Jagielski authored Aug 25, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161535 13f79535-47bb-0310-9956-ffa450edef68

9c3814ad

Fold in Stefan's initial PoC for fixing memory issues with ranges · d9166565

Jim Jagielski authored Aug 25, 2011

by keeping orig brigade untouched and avoiding 1byte brigades
(related to CVE-2011-3192)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161534 13f79535-47bb-0310-9956-ffa450edef68

d9166565