openssl/patches/999-cfg-opts.patch

diff -Nur openssl-0.9.8h.orig/apps/ocsp.c openssl-0.9.8h/apps/ocsp.c
--- openssl-0.9.8h.orig/apps/ocsp.c     2008-04-02 16:51:08.000000000 +0200
+++ openssl-0.9.8h/apps/ocsp.c  2008-05-29 23:13:18.000000000 +0200
@@ -55,7 +55,6 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-#ifndef OPENSSL_NO_OCSP
 #define USE_SOCKETS
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,6 +64,8 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
+#ifndef OPENSSL_NO_OCSP
+
 /* Maximum leeway in validity period: default 5 minutes */
 #define MAX_VALIDITY_PERIOD    (5 * 60)
 
diff -Nur openssl-0.9.8h.orig/apps/progs.pl openssl-0.9.8h/apps/progs.pl
--- openssl-0.9.8h.orig/apps/progs.pl   2008-04-04 01:03:41.000000000 +0200
+++ openssl-0.9.8h/apps/progs.pl        2008-05-29 23:13:18.000000000 +0200
@@ -43,6 +43,8 @@
                { print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
        elsif ( ($_ =~ /^pkcs12$/))
                { print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^ocsp$/))
+               { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
        elsif ( ($_ =~ /^cms$/))
                { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
        else
diff -Nur openssl-0.9.8h.orig/crypto/x509v3/v3_ocsp.c openssl-0.9.8h/crypto/x509v3/v3_ocsp.c
--- openssl-0.9.8h.orig/crypto/x509v3/v3_ocsp.c 2007-01-21 14:16:48.000000000 +0100
+++ openssl-0.9.8h/crypto/x509v3/v3_ocsp.c      2008-05-29 23:13:18.000000000 +0200
@@ -56,8 +56,6 @@
  *
  */
 
-#ifndef OPENSSL_NO_OCSP
-
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/conf.h>
@@ -65,6 +63,8 @@
 #include <openssl/ocsp.h>
 #include <openssl/x509v3.h>
 
+#ifndef OPENSSL_NO_OCSP
+
 /* OCSP extensions and a couple of CRL entry extensions
  */
 
// Log In
// CVSweb
Project: FreeWRT
// Summary // Activity // Search // Tracker // Lists // News // SCM // Wiki
1	diff -Nur openssl-0.9.8h.orig/apps/ocsp.c openssl-0.9.8h/apps/ocsp.c
2	--- openssl-0.9.8h.orig/apps/ocsp.c 2008-04-02 16:51:08.000000000 +0200
3	+++ openssl-0.9.8h/apps/ocsp.c 2008-05-29 23:13:18.000000000 +0200
4	@@ -55,7 +55,6 @@
5	* Hudson (tjh@cryptsoft.com).
6	*
7	*/
8	-#ifndef OPENSSL_NO_OCSP
9	#define USE_SOCKETS
10	#include <stdio.h>
11	#include <stdlib.h>
12	@@ -65,6 +64,8 @@
13	#include <openssl/ssl.h>
14	#include <openssl/err.h>
15
16	+#ifndef OPENSSL_NO_OCSP
17	+
18	/* Maximum leeway in validity period: default 5 minutes */
19	#define MAX_VALIDITY_PERIOD (5 * 60)
20
21	diff -Nur openssl-0.9.8h.orig/apps/progs.pl openssl-0.9.8h/apps/progs.pl
22	--- openssl-0.9.8h.orig/apps/progs.pl 2008-04-04 01:03:41.000000000 +0200
23	+++ openssl-0.9.8h/apps/progs.pl 2008-05-29 23:13:18.000000000 +0200
24	@@ -43,6 +43,8 @@
25	{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
26	elsif ( ($_ =~ /^pkcs12$/))
27	{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
28	+ elsif ( ($_ =~ /^ocsp$/))
29	+ { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
30	elsif ( ($_ =~ /^cms$/))
31	{ print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
32	else
33	diff -Nur openssl-0.9.8h.orig/crypto/x509v3/v3_ocsp.c openssl-0.9.8h/crypto/x509v3/v3_ocsp.c
34	--- openssl-0.9.8h.orig/crypto/x509v3/v3_ocsp.c 2007-01-21 14:16:48.000000000 +0100
35	+++ openssl-0.9.8h/crypto/x509v3/v3_ocsp.c 2008-05-29 23:13:18.000000000 +0200
36	@@ -56,8 +56,6 @@
37	*
38	*/
39
40	-#ifndef OPENSSL_NO_OCSP
41	-
42	#include <stdio.h>
43	#include "cryptlib.h"
44	#include <openssl/conf.h>
45	@@ -65,6 +63,8 @@
46	#include <openssl/ocsp.h>
47	#include <openssl/x509v3.h>
48
49	+#ifndef OPENSSL_NO_OCSP
50	+
51	/* OCSP extensions and a couple of CRL entry extensions
52	*/
53