Browse Source

Fix safestack issues in cmp.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 2 years ago
parent
commit
798f932980
16 changed files with 24 additions and 33 deletions
  1. +1
    -0
      .gitignore
  2. +0
    -2
      apps/cmp.c
  3. +0
    -2
      apps/cmp_mock_srv.c
  4. +2
    -0
      build.info
  5. +0
    -2
      crypto/cmp/cmp_asn.c
  6. +0
    -2
      crypto/cmp/cmp_client.c
  7. +0
    -2
      crypto/cmp/cmp_ctx.c
  8. +0
    -2
      crypto/cmp/cmp_hdr.c
  9. +0
    -4
      crypto/cmp/cmp_msg.c
  10. +0
    -2
      crypto/cmp/cmp_server.c
  11. +0
    -2
      fuzz/cmp.c
  12. +21
    -5
      include/openssl/cmp.h.in
  13. +0
    -2
      test/cmp_client_test.c
  14. +0
    -2
      test/cmp_ctx_test.c
  15. +0
    -2
      test/cmp_hdr_test.c
  16. +0
    -2
      test/cmp_msg_test.c

+ 1
- 0
.gitignore View File

@ -23,6 +23,7 @@
/crypto/buildinf.h
/include/crypto/*_conf.h
/include/openssl/asn1.h
/include/openssl/cmp.h
/include/openssl/configuration.h
/include/openssl/fipskey.h
/include/openssl/opensslv.h


+ 0
- 2
apps/cmp.c View File

@ -42,8 +42,6 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
DEFINE_STACK_OF(OSSL_CMP_ITAV)
static char *opt_config = NULL;
#define CMP_SECTION "cmp"
#define SECTION_NAME_MAX 40 /* max length of section name */


+ 0
- 2
apps/cmp_mock_srv.c View File

@ -14,8 +14,6 @@
#include <openssl/cmp.h>
#include <openssl/err.h>
#include <openssl/cmperr.h>
DEFINE_STACK_OF(OSSL_CMP_ITAV)
/* the context for the CMP mock server */
typedef struct


+ 2
- 0
build.info View File

@ -14,6 +14,7 @@ DEPEND[libssl]=libcrypto
# Empty DEPEND "indices" means the dependencies are expected to be built
# unconditionally before anything else.
DEPEND[]=include/openssl/asn1.h \
include/openssl/cmp.h \
include/openssl/configuration.h \
include/openssl/fipskey.h \
include/openssl/opensslv.h \
@ -26,6 +27,7 @@ DEPEND[]=include/openssl/asn1.h \
GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in
GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in
GENERATE[include/openssl/cmp.h]=include/openssl/cmp.h.in
GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in
GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in
GENERATE[include/openssl/safestack.h]=include/openssl/safestack.h.in


+ 0
- 2
crypto/cmp/cmp_asn.c View File

@ -17,8 +17,6 @@
#include <openssl/cmp.h>
#include <openssl/crmf.h>
DEFINE_STACK_OF(OSSL_CMP_ITAV)
/* ASN.1 declarations from RFC4210 */
ASN1_SEQUENCE(OSSL_CMP_REVANNCONTENT) = {
/* OSSL_CMP_PKISTATUS is effectively ASN1_INTEGER so it is used directly */


+ 0
- 2
crypto/cmp/cmp_client.c View File

@ -21,8 +21,6 @@
#include "openssl/cmp_util.h"
DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE)
DEFINE_STACK_OF(OSSL_CMP_PKISI)
DEFINE_STACK_OF(OSSL_CRMF_CERTID)
#define IS_CREP(t) ((t) == OSSL_CMP_PKIBODY_IP || (t) == OSSL_CMP_PKIBODY_CP \


+ 0
- 2
crypto/cmp/cmp_ctx.c View File

@ -21,8 +21,6 @@
#include <openssl/crmf.h>
#include <openssl/err.h>
DEFINE_STACK_OF(OSSL_CMP_ITAV)
/*
* Get current certificate store containing trusted root CA certs
*/


+ 0
- 2
crypto/cmp/cmp_hdr.c View File

@ -20,8 +20,6 @@
#include <openssl/cmp.h>
#include <openssl/err.h>
DEFINE_STACK_OF(OSSL_CMP_ITAV)
int ossl_cmp_hdr_set_pvno(OSSL_CMP_PKIHEADER *hdr, int pvno)
{
if (!ossl_assert(hdr != NULL))


+ 0
- 4
crypto/cmp/cmp_msg.c View File

@ -21,11 +21,7 @@
#include <openssl/x509.h>
#include "crypto/x509.h" /* for x509_set0_libctx() */
DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS)
DEFINE_STACK_OF(OSSL_CMP_ITAV)
DEFINE_STACK_OF(OSSL_CMP_PKISI)
DEFINE_STACK_OF(OSSL_CRMF_MSG)
DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE)
DEFINE_STACK_OF(OSSL_CRMF_CERTID)
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg)


+ 0
- 2
crypto/cmp/cmp_server.c View File

@ -20,8 +20,6 @@
#include <openssl/err.h>
DEFINE_STACK_OF(OSSL_CRMF_MSG)
DEFINE_STACK_OF(OSSL_CMP_ITAV)
DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS)
/* the context for the generic CMP server */
struct ossl_cmp_srv_ctx_st


+ 0
- 2
fuzz/cmp.c View File

@ -18,8 +18,6 @@
#include "fuzzer.h"
#include "rand.inc"
DEFINE_STACK_OF(OSSL_CMP_ITAV)
int FuzzerInitialize(int *argc, char ***argv)
{
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);


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


+ 0
- 2
test/cmp_client_test.c View File

@ -15,8 +15,6 @@
#ifndef NDEBUG /* tests need mock server, which is available only if !NDEBUG */
DEFINE_STACK_OF(OSSL_CMP_ITAV)
static const char *server_key_f;
static const char *server_cert_f;
static const char *client_key_f;


+ 0
- 2
test/cmp_ctx_test.c View File

@ -13,8 +13,6 @@
#include <openssl/x509_vfy.h>
DEFINE_STACK_OF(OSSL_CMP_ITAV)
typedef struct test_fixture {
const char *test_case_name;
OSSL_CMP_CTX *ctx;


+ 0
- 2
test/cmp_hdr_test.c View File

@ -11,8 +11,6 @@
#include "cmp_testlib.h"
DEFINE_STACK_OF(OSSL_CMP_ITAV)
static unsigned char rand_data[OSSL_CMP_TRANSACTIONID_LENGTH];
typedef struct test_fixture {


+ 0
- 2
test/cmp_msg_test.c View File

@ -11,8 +11,6 @@
#include "cmp_testlib.h"
DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE)
static const char *newkey_f;
static const char *server_cert_f;
static const char *pkcs10_f;


Loading…
Cancel
Save