Browse Source

Fix safestack issues in asn1t.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
0b28254015
7 changed files with 13 additions and 9 deletions
  1. +1
    -0
      .gitignore
  2. +2
    -0
      build.info
  3. +0
    -2
      crypto/asn1/tasn_dec.c
  4. +0
    -2
      crypto/asn1/tasn_fre.c
  5. +0
    -2
      crypto/asn1/tasn_new.c
  6. +0
    -2
      crypto/x509/x_name.c
  7. +10
    -1
      include/openssl/asn1t.h.in

+ 1
- 0
.gitignore View File

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


+ 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/asn1t.h \
include/openssl/cmp.h \
include/openssl/cms.h \
include/openssl/configuration.h \
@ -33,6 +34,7 @@ DEPEND[]=include/openssl/asn1.h \
doc/man7/openssl_user_macros.pod
GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in
GENERATE[include/openssl/asn1t.h]=include/openssl/asn1t.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/configuration.h]=include/openssl/configuration.h.in


+ 0
- 2
crypto/asn1/tasn_dec.c View File

@ -17,8 +17,6 @@
#include "internal/numbers.h"
#include "asn1_local.h"
DEFINE_STACK_OF(ASN1_VALUE)
/*
* Constructed types with a recursive definition (such as can be found in PKCS7)
* could eventually exceed the stack given malicious input with excessive


+ 0
- 2
crypto/asn1/tasn_fre.c View File

@ -13,8 +13,6 @@
#include <openssl/objects.h>
#include "asn1_local.h"
DEFINE_STACK_OF(ASN1_VALUE)
/* Free up an ASN1 structure */
void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it)


+ 0
- 2
crypto/asn1/tasn_new.c View File

@ -15,8 +15,6 @@
#include <string.h>
#include "asn1_local.h"
DEFINE_STACK_OF(ASN1_VALUE)
static int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
int embed);
static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it,


+ 0
- 2
crypto/x509/x_name.c View File

@ -16,8 +16,6 @@
#include "crypto/asn1.h"
#include "x509_local.h"
DEFINE_STACK_OF(ASN1_VALUE)
/*
* Maximum length of X509_NAME: much larger than anything we should
* ever see in practice.


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


Loading…
Cancel
Save