search

alecmuffett / certificate-transparency

Automatically exported from code.google.com/p/certificate-transparency
0 stars 0 forks source link

Problem applying apache-serverinfo.patch #38

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
1. $ svn co https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x 
httpd-2.4 
2. $ cd httpd-2.4
3. $ svn co https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr 
4. patch -p0 < 
/path/to/certificate-transparency/src/test/apache-serverinfo.patch

The result is
==
patching file CHANGES
Hunk #1 succeeded at 192 with fuzz 2 (offset 190 lines).
patching file modules/ssl/mod_ssl.c
Hunk #1 FAILED at 94.
Hunk #2 succeeded at 295 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file modules/ssl/mod_ssl.c.rej
patching file modules/ssl/ssl_engine_config.c
Hunk #1 succeeded at 121 (offset -4 lines).
Hunk #2 succeeded at 267 (offset 5 lines).
Hunk #3 succeeded at 818 (offset -32 lines).
patching file modules/ssl/ssl_engine_init.c
Hunk #1 FAILED at 997.
Hunk #2 FAILED at 1036.
Hunk #3 FAILED at 1173.
3 out of 3 hunks FAILED -- saving rejects to file 
modules/ssl/ssl_engine_init.c.rej
patching file modules/ssl/ssl_private.h
Hunk #1 succeeded at 590 (offset -72 lines).
Hunk #2 succeeded at 675 (offset -69 lines).
patching file modules/ssl/ssl_util.c
Hunk #1 succeeded at 316 (offset -128 lines).
Hunk #2 succeeded at 356 (offset -128 lines).
Hunk #3 succeeded at 389 (offset -128 lines).
=====

I'm using current sources of CT, Debian Linux.

The chunk from modules/ssl/mod_ssl.c can be applied manually but the function 
ssl_server_import_cert in modules/ssl/ssl_engine_init.c is absent at all.

Original issue reported on code.google.com by beld...@gmail.com on 3 Apr 2014 at 12:21

GoogleCodeExporter commented 9 years ago 
Ben, as the author, could you please have a look?

Original comment by er...@google.com on 3 Apr 2014 at 1:18

GoogleCodeExporter commented 9 years ago 
Sure can.

Original comment by benl@google.com on 3 Apr 2014 at 3:04

GoogleCodeExporter commented 9 years ago 
I have not managed to test the attached patch yet, but it does compile. Do let 
me know if you get a chance to test it, I'm out of time today, so will get to 
it next week.

Original comment by benl@google.com on 4 Apr 2014 at 3:54

Attachments:

GoogleCodeExporter commented 9 years ago 
Now patch applies and compiles, but I get an error:

beldmit@CT$ ./run_apache_server.sh /home/beldmit/httpd-2.4/ /usr/local/ssl/
AH00526: Syntax error on line 26 of 
/home/beldmit/certificate-transparency/src/test/httpd-devel.conf:
Invalid command 'SSLRSAInfoFile', perhaps misspelled or defined by a module not 
included in the server configuration

Original comment by beld...@gmail.com on 7 Apr 2014 at 7:21

GoogleCodeExporter commented 9 years ago 
You should use SSLCertificateInfoFile instead.

Original comment by benl@google.com on 7 Apr 2014 at 9:04

GoogleCodeExporter commented 9 years ago 
Thank you, it (apache) works!

Original comment by beld...@gmail.com on 7 Apr 2014 at 9:46

GoogleCodeExporter commented 9 years ago 
Fixed by 0ee29e029de4332eea654d756ed3ea2685162d52.

Original comment by benl@google.com on 8 Apr 2014 at 2:00

GoogleCodeExporter commented 9 years ago

Original comment by benl@google.com on 8 Apr 2014 at 2:01