Browse Source

Fix safestack issues in pkcs7.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
02199cc39d
12 changed files with 18 additions and 16 deletions
  1. +1
    -0
      .gitignore
  2. +0
    -1
      apps/pkcs12.c
  3. +2
    -0
      build.info
  4. +0
    -1
      crypto/pkcs12/p12_crt.c
  5. +0
    -1
      crypto/pkcs12/p12_kiss.c
  6. +0
    -1
      crypto/pkcs12/p12_npas.c
  7. +0
    -3
      crypto/pkcs7/pk7_doit.c
  8. +0
    -3
      crypto/pkcs7/pk7_lib.c
  9. +0
    -1
      crypto/pkcs7/pk7_smime.c
  10. +0
    -1
      crypto/ts/ts_rsp_verify.c
  11. +15
    -3
      include/openssl/pkcs7.h.in
  12. +0
    -1
      test/pkcs12_helper.c

+ 1
- 0
.gitignore View File

@ -29,6 +29,7 @@
/include/openssl/fipskey.h
/include/openssl/ocsp.h
/include/openssl/opensslv.h
/include/openssl/pkcs7.h
/include/openssl/safestack.h
/include/openssl/ssl.h
/include/openssl/x509.h


+ 0
- 1
apps/pkcs12.c View File

@ -20,7 +20,6 @@
#include <openssl/pkcs12.h>
#include <openssl/provider.h>
DEFINE_STACK_OF(PKCS7)
DEFINE_STACK_OF(PKCS12_SAFEBAG)
#define NOKEYS 0x1


+ 2
- 0
build.info View File

@ -20,6 +20,7 @@ DEPEND[]=include/openssl/asn1.h \
include/openssl/fipskey.h \
include/openssl/opensslv.h \
include/openssl/ocsp.h \
include/openssl/pkcs7.h \
include/openssl/safestack.h \
include/openssl/ssl.h \
include/openssl/x509.h \
@ -34,6 +35,7 @@ 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/pkcs7.h]=include/openssl/pkcs7.h.in
GENERATE[include/openssl/safestack.h]=include/openssl/safestack.h.in
GENERATE[include/openssl/ssl.h]=include/openssl/ssl.h.in
GENERATE[include/openssl/x509.h]=include/openssl/x509.h.in


+ 0
- 1
crypto/pkcs12/p12_crt.c View File

@ -12,7 +12,6 @@
#include <openssl/pkcs12.h>
#include "p12_local.h"
DEFINE_STACK_OF(PKCS7)
DEFINE_STACK_OF(PKCS12_SAFEBAG)
static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,


+ 0
- 1
crypto/pkcs12/p12_kiss.c View File

@ -12,7 +12,6 @@
#include <openssl/pkcs12.h>
#include "crypto/x509.h" /* for X509_add_cert_new() */
DEFINE_STACK_OF(PKCS7)
DEFINE_STACK_OF(PKCS12_SAFEBAG)
/* Simplified PKCS#12 routines */


+ 0
- 1
crypto/pkcs12/p12_npas.c View File

@ -15,7 +15,6 @@
#include <openssl/pkcs12.h>
#include "p12_local.h"
DEFINE_STACK_OF(PKCS7)
DEFINE_STACK_OF(PKCS12_SAFEBAG)
/* PKCS#12 password change routine */


+ 0
- 3
crypto/pkcs7/pk7_doit.c View File

@ -16,9 +16,6 @@
#include <openssl/err.h>
#include "pk7_local.h"
DEFINE_STACK_OF(PKCS7_RECIP_INFO)
DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
void *value);
static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid);


+ 0
- 3
crypto/pkcs7/pk7_lib.c View File

@ -16,9 +16,6 @@
#include "crypto/x509.h" /* for sk_X509_add1_cert() */
#include "pk7_local.h"
DEFINE_STACK_OF(PKCS7_RECIP_INFO)
DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
{
int nid;


+ 0
- 1
crypto/pkcs7/pk7_smime.c View File

@ -17,7 +17,6 @@
#define BUFFERSIZE 4096
DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si);


+ 0
- 1
crypto/ts/ts_rsp_verify.c View File

@ -15,7 +15,6 @@
#include "ts_local.h"
#include "crypto/ess.h"
DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
DEFINE_STACK_OF(ESS_CERT_ID)
DEFINE_STACK_OF(ESS_CERT_ID_V2)


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


+ 0
- 1
test/pkcs12_helper.c View File

@ -21,7 +21,6 @@
#include "testutil.h"
#include "pkcs12_helper.h"
DEFINE_STACK_OF(PKCS7)
DEFINE_STACK_OF(PKCS12_SAFEBAG)
/* Set this to > 0 write test data to file */


Loading…
Cancel
Save