Commit 5951e840 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-ocsp on Windows (and probably VMS) 



The ocsp.h file did not have appropriate guards causing link failures on
Windows.

GH Issue 900

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 5d94e5b6

apps/opt.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <ctype.h>

#include <limits.h>

#include <openssl/bio.h>

#include <openssl/x509v3.h>



#define MAX_OPT_HELP_WIDTH 30

const char OPT_HELP_STR[] = "--";

include/openssl/ocsp.h

+77 −66
Original line number Diff line number Diff line
@@ -66,6 +66,37 @@ 
#ifndef HEADER_OCSP_H

# define HEADER_OCSP_H



#include <openssl/opensslconf.h>



/*

 * These definitions are outside the OPENSSL_NO_OCSP guard because although for

 * historical reasons they have OCSP_* names, they can actually be used

 * independently of OCSP. E.g. see RFC5280

 */

/*-

 *   CRLReason ::= ENUMERATED {

 *        unspecified             (0),

 *        keyCompromise           (1),

 *        cACompromise            (2),

 *        affiliationChanged      (3),

 *        superseded              (4),

 *        cessationOfOperation    (5),

 *        certificateHold         (6),

 *        removeFromCRL           (8) }

 */

#  define OCSP_REVOKED_STATUS_NOSTATUS               -1

#  define OCSP_REVOKED_STATUS_UNSPECIFIED             0

#  define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1

#  define OCSP_REVOKED_STATUS_CACOMPROMISE            2

#  define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3

#  define OCSP_REVOKED_STATUS_SUPERSEDED              4

#  define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5

#  define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6

#  define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8





# ifndef OPENSSL_NO_OCSP



#  include <openssl/ossl_typ.h>

#  include <openssl/x509.h>

#  include <openssl/x509v3.h>
@@ -134,27 +165,6 @@ typedef struct ocsp_response_data_st OCSP_RESPDATA; 


typedef struct ocsp_basic_response_st OCSP_BASICRESP;



/*-

 *   CRLReason ::= ENUMERATED {

 *        unspecified             (0),

 *        keyCompromise           (1),

 *        cACompromise            (2),

 *        affiliationChanged      (3),

 *        superseded              (4),

 *        cessationOfOperation    (5),

 *        certificateHold         (6),

 *        removeFromCRL           (8) }

 */

# define OCSP_REVOKED_STATUS_NOSTATUS               -1

# define OCSP_REVOKED_STATUS_UNSPECIFIED             0

# define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1

# define OCSP_REVOKED_STATUS_CACOMPROMISE            2

# define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3

# define OCSP_REVOKED_STATUS_SUPERSEDED              4

# define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5

# define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6

# define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8



typedef struct ocsp_crl_id_st OCSP_CRLID;

typedef struct ocsp_service_locator_st OCSP_SERVICELOC;
@@ -454,3 +464,4 @@ void ERR_load_OCSP_strings(void); 
}

#endif

# endif

#endif

ssl/t1_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
#include <openssl/evp.h>

#include <openssl/hmac.h>

#include <openssl/ocsp.h>

#include <openssl/conf.h>

#include <openssl/x509v3.h>

#include <openssl/rand.h>

#include <openssl/dh.h>

#include <openssl/bn.h>

util/libcrypto.num

+186 −186

File changed.

Preview size limit exceeded, changes collapsed.