Browse Source

Fix safestack issues in x509_vfy.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
c5a5581127
7 changed files with 14 additions and 12 deletions
  1. +1
    -0
      .gitignore
  2. +2
    -0
      build.info
  3. +0
    -2
      crypto/cmp/cmp_util.c
  4. +0
    -2
      crypto/x509/by_dir.c
  5. +0
    -3
      crypto/x509/x509_lu.c
  6. +0
    -2
      crypto/x509/x509_vpm.c
  7. +11
    -3
      include/openssl/x509_vfy.h.in

+ 1
- 0
.gitignore View File

@ -35,6 +35,7 @@
/include/openssl/ssl.h
/include/openssl/x509.h
/include/openssl/x509v3.h
/include/openssl/x509_vfy.h
# Auto generated doc files
doc/man1/openssl-*.pod


+ 2
- 0
build.info View File

@ -26,6 +26,7 @@ DEPEND[]=include/openssl/asn1.h \
include/openssl/ssl.h \
include/openssl/x509.h \
include/openssl/x509v3.h \
include/openssl/x509_vfy.h \
include/crypto/bn_conf.h include/crypto/dso_conf.h \
doc/man7/openssl_user_macros.pod
@ -42,6 +43,7 @@ GENERATE[include/openssl/srp.h]=include/openssl/srp.h.in
GENERATE[include/openssl/ssl.h]=include/openssl/ssl.h.in
GENERATE[include/openssl/x509.h]=include/openssl/x509.h.in
GENERATE[include/openssl/x509v3.h]=include/openssl/x509v3.h.in
GENERATE[include/openssl/x509_vfy.h]=include/openssl/x509_vfy.h.in
GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in


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

@ -16,8 +16,6 @@
#include <openssl/err.h> /* should be implied by cmperr.h */
#include <openssl/x509v3.h>
DEFINE_STACK_OF(X509_OBJECT)
/*
* use trace API for CMP-specific logging, prefixed by "CMP " and severity
*/


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

@ -22,8 +22,6 @@
#include "crypto/x509.h"
#include "x509_local.h"
DEFINE_STACK_OF(X509_OBJECT)
struct lookup_dir_hashes_st {
unsigned long hash;
int suffix;


+ 0
- 3
crypto/x509/x509_lu.c View File

@ -15,9 +15,6 @@
#include <openssl/x509v3.h>
#include "x509_local.h"
DEFINE_STACK_OF(X509_LOOKUP)
DEFINE_STACK_OF(X509_OBJECT)
X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
{
X509_LOOKUP *ret = OPENSSL_zalloc(sizeof(*ret));


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

@ -18,8 +18,6 @@
#include "x509_local.h"
DEFINE_STACK_OF(X509_VERIFY_PARAM)
/* X509_VERIFY_PARAM functions */
#define SET_HOST 0


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


Loading…
Cancel
Save