| 1 |
diff -urN openssl-0.9.8d.orig/apps/ocsp.c openssl-0.9.8d/apps/ocsp.c |
diff -Nur openssl-0.9.8h.orig/apps/ocsp.c openssl-0.9.8h/apps/ocsp.c |
| 2 |
--- openssl-0.9.8d.orig/apps/ocsp.c 2004-05-17 21:05:32.000000000 +0200 |
--- openssl-0.9.8h.orig/apps/ocsp.c 2008-04-02 16:51:08.000000000 +0200 |
| 3 |
+++ openssl-0.9.8d/apps/ocsp.c 2007-03-01 14:50:15.000000000 +0100 |
+++ openssl-0.9.8h/apps/ocsp.c 2008-05-29 23:13:18.000000000 +0200 |
| 4 |
@@ -55,7 +55,6 @@ |
@@ -55,7 +55,6 @@ |
| 5 |
* Hudson (tjh@cryptsoft.com). |
* Hudson (tjh@cryptsoft.com). |
| 6 |
* |
* |
| 7 |
*/ |
*/ |
| 8 |
-#ifndef OPENSSL_NO_OCSP |
-#ifndef OPENSSL_NO_OCSP |
| 9 |
|
#define USE_SOCKETS |
| 10 |
#include <stdio.h> |
#include <stdio.h> |
| 11 |
#include <string.h> |
#include <stdlib.h> |
| 12 |
@@ -66,6 +65,8 @@ |
@@ -65,6 +64,8 @@ |
| 13 |
#include <openssl/ssl.h> |
#include <openssl/ssl.h> |
| 14 |
#include <openssl/bn.h> |
#include <openssl/err.h> |
| 15 |
|
|
| 16 |
+#ifndef OPENSSL_NO_OCSP |
+#ifndef OPENSSL_NO_OCSP |
| 17 |
+ |
+ |
| 18 |
/* Maximum leeway in validity period: default 5 minutes */ |
/* Maximum leeway in validity period: default 5 minutes */ |
| 19 |
#define MAX_VALIDITY_PERIOD (5 * 60) |
#define MAX_VALIDITY_PERIOD (5 * 60) |
| 20 |
|
|
| 21 |
diff -urN openssl-0.9.8d.orig/apps/progs.pl openssl-0.9.8d/apps/progs.pl |
diff -Nur openssl-0.9.8h.orig/apps/progs.pl openssl-0.9.8h/apps/progs.pl |
| 22 |
--- openssl-0.9.8d.orig/apps/progs.pl 2006-06-09 17:42:11.000000000 +0200 |
--- openssl-0.9.8h.orig/apps/progs.pl 2008-04-04 01:03:41.000000000 +0200 |
| 23 |
+++ openssl-0.9.8d/apps/progs.pl 2007-03-01 14:52:18.000000000 +0100 |
+++ openssl-0.9.8h/apps/progs.pl 2008-05-29 23:13:18.000000000 +0200 |
| 24 |
@@ -43,6 +43,8 @@ |
@@ -43,6 +43,8 @@ |
| 25 |
{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; } |
{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; } |
| 26 |
elsif ( ($_ =~ /^pkcs12$/)) |
elsif ( ($_ =~ /^pkcs12$/)) |
| 27 |
{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; } |
{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; } |
| 28 |
+ elsif ( ($_ =~ /^ocsp$/)) |
+ elsif ( ($_ =~ /^ocsp$/)) |
| 29 |
+ { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; } |
+ { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; } |
| 30 |
|
elsif ( ($_ =~ /^cms$/)) |
| 31 |
|
{ print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; } |
| 32 |
else |
else |
| 33 |
{ print $str; } |
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 |
diff -urN openssl-0.9.8d.orig/crypto/x509v3/v3_ocsp.c openssl-0.9.8d/crypto/x509v3/v3_ocsp.c |
+++ openssl-0.9.8h/crypto/x509v3/v3_ocsp.c 2008-05-29 23:13:18.000000000 +0200 |
|
--- openssl-0.9.8d.orig/crypto/x509v3/v3_ocsp.c 2004-03-16 00:15:23.000000000 +0100 |
|
|
+++ openssl-0.9.8d/crypto/x509v3/v3_ocsp.c 2007-03-01 14:49:49.000000000 +0100 |
|
| 36 |
@@ -56,8 +56,6 @@ |
@@ -56,8 +56,6 @@ |
| 37 |
* |
* |
| 38 |
*/ |
*/ |