Browse Source

Fix safestack issues in ocsp.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
master
Matt Caswell 1 year ago
parent
commit
fd3ed85c67
12 changed files with 19 additions and 23 deletions
  1. +1
    -0
      .gitignore
  2. +0
    -1
      apps/ocsp.c
  3. +2
    -0
      build.info
  4. +0
    -3
      crypto/ocsp/ocsp_cl.c
  5. +0
    -3
      crypto/ocsp/ocsp_prn.c
  6. +0
    -3
      crypto/ocsp/ocsp_srv.c
  7. +0
    -3
      crypto/ocsp/ocsp_vfy.c
  8. +16
    -4
      include/openssl/ocsp.h.in
  9. +0
    -1
      ssl/ssl_lib.c
  10. +0
    -2
      ssl/statem/extensions_clnt.c
  11. +0
    -2
      ssl/statem/extensions_srvr.c
  12. +0
    -1
      test/sslapitest.c

+ 1
- 0
.gitignore View File

@ -27,6 +27,7 @@
/include/openssl/cms.h
/include/openssl/configuration.h
/include/openssl/fipskey.h
/include/openssl/ocsp.h
/include/openssl/opensslv.h
/include/openssl/safestack.h
/include/openssl/ssl.h


+ 0
- 1
apps/ocsp.c View File

@ -33,7 +33,6 @@
#include <openssl/bn.h>
#include <openssl/x509v3.h>
DEFINE_STACK_OF(OCSP_CERTID)
DEFINE_STACK_OF(CONF_VALUE)
#if defined(__TANDEM)


+ 2
- 0
build.info View File

@ -19,6 +19,7 @@ DEPEND[]=include/openssl/asn1.h \
include/openssl/configuration.h \
include/openssl/fipskey.h \
include/openssl/opensslv.h \
include/openssl/ocsp.h \
include/openssl/safestack.h \
include/openssl/ssl.h \
include/openssl/x509.h \
@ -31,6 +32,7 @@ GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in
GENERATE[include/openssl/cmp.h]=include/openssl/cmp.h.in
GENERATE[include/openssl/cms.h]=include/openssl/cms.h.in
GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in
GENERATE[include/openssl/ocsp.h]=include/openssl/ocsp.h.in
GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in
GENERATE[include/openssl/safestack.h]=include/openssl/safestack.h.in
GENERATE[include/openssl/ssl.h]=include/openssl/ssl.h.in


+ 0
- 3
crypto/ocsp/ocsp_cl.c View File

@ -18,9 +18,6 @@
#include <openssl/ocsp.h>
#include "ocsp_local.h"
DEFINE_STACK_OF(OCSP_ONEREQ)
DEFINE_STACK_OF(OCSP_SINGLERESP)
/*
* Utility functions related to sending OCSP requests and extracting relevant
* information from the response.


+ 0
- 3
crypto/ocsp/ocsp_prn.c View File

@ -14,9 +14,6 @@
#include "internal/cryptlib.h"
#include <openssl/pem.h>
DEFINE_STACK_OF(OCSP_ONEREQ)
DEFINE_STACK_OF(OCSP_SINGLERESP)
static int ocsp_certid_print(BIO *bp, OCSP_CERTID *a, int indent)
{
BIO_printf(bp, "%*sCertificate ID:\n", indent, "");


+ 0
- 3
crypto/ocsp/ocsp_srv.c View File

@ -16,9 +16,6 @@
#include <openssl/ocsp.h>
#include "ocsp_local.h"
DEFINE_STACK_OF(OCSP_ONEREQ)
DEFINE_STACK_OF(OCSP_SINGLERESP)
/*
* Utility functions related to sending OCSP responses and extracting
* relevant information from the request.


+ 0
- 3
crypto/ocsp/ocsp_vfy.c View File

@ -12,9 +12,6 @@
#include <openssl/err.h>
#include <string.h>
DEFINE_STACK_OF(OCSP_ONEREQ)
DEFINE_STACK_OF(OCSP_SINGLERESP)
static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
STACK_OF(X509) *certs, unsigned long flags);
static X509 *ocsp_find_signer_sk(STACK_OF(X509) *certs, OCSP_RESPID *id);


include/openssl/ocsp.h → include/openssl/ocsp.h.in View File


+ 0
- 1
ssl/ssl_lib.c View File

@ -28,7 +28,6 @@
#include "internal/refcount.h"
#include "internal/ktls.h"
DEFINE_STACK_OF(OCSP_RESPID)
DEFINE_STACK_OF(SCT)
static int ssl_undefined_function_1(SSL *ssl, SSL3_RECORD *r, size_t s, int t,


+ 0
- 2
ssl/statem/extensions_clnt.c View File

@ -12,8 +12,6 @@
#include "internal/cryptlib.h"
#include "statem_local.h"
DEFINE_STACK_OF(OCSP_RESPID)
EXT_RETURN tls_construct_ctos_renegotiate(SSL *s, WPACKET *pkt,
unsigned int context, X509 *x,
size_t chainidx)


+ 0
- 2
ssl/statem/extensions_srvr.c View File

@ -12,8 +12,6 @@
#include "statem_local.h"
#include "internal/cryptlib.h"
DEFINE_STACK_OF(OCSP_RESPID)
#define COOKIE_STATE_FORMAT_VERSION 0
/*


+ 0
- 1
test/sslapitest.c View File

@ -47,7 +47,6 @@ int tls_provider_init(const OSSL_CORE_HANDLE *handle,
const OSSL_DISPATCH *in,
const OSSL_DISPATCH **out,
void **provctx);
DEFINE_STACK_OF(OCSP_RESPID)
static OPENSSL_CTX *libctx = NULL;
static OSSL_PROVIDER *defctxnull = NULL;


Loading…
Cancel
Save