Browse Source

Fix safestack issues in bio.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
dd73147420
5 changed files with 12 additions and 5 deletions
  1. +1
    -0
      .gitignore
  2. +2
    -0
      build.info
  3. +0
    -2
      crypto/asn1/asn_mime.c
  4. +0
    -2
      crypto/conf/conf_def.c
  5. +9
    -1
      include/openssl/bio.h.in

+ 1
- 0
.gitignore View File

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


+ 2
- 0
build.info View File

@ -15,6 +15,7 @@ DEPEND[libssl]=libcrypto
# unconditionally before anything else.
DEPEND[]=include/openssl/asn1.h \
include/openssl/asn1t.h \
include/openssl/bio.h \
include/openssl/cmp.h \
include/openssl/cms.h \
include/openssl/configuration.h \
@ -36,6 +37,7 @@ DEPEND[]=include/openssl/asn1.h \
GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in
GENERATE[include/openssl/asn1t.h]=include/openssl/asn1t.h.in
GENERATE[include/openssl/bio.h]=include/openssl/bio.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/asn_mime.c View File

@ -19,8 +19,6 @@
#include "internal/bio.h"
#include "asn1_local.h"
DEFINE_STACK_OF(BIO)
/*
* Generalised MIME like utilities for streaming ASN1. Although many have a
* PKCS7/CMS like flavour others are more general purpose.


+ 0
- 2
crypto/conf/conf_def.c View File

@ -30,8 +30,6 @@
# endif
#endif
DEFINE_STACK_OF(BIO)
#ifndef S_ISDIR
# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
#endif


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


Loading…
Cancel
Save