mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix safestack issues in x509_vfy.h

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
This commit is contained in:
Matt Caswell 2020-09-03 15:37:45 +01:00
parent 22fbfe6a7d
commit c5a5581127
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
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
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

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
*/

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;

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));

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

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

@ -1,4 +1,6 @@
/*
* {- join("\n * ", @autowarntext) -}
*
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@ -7,6 +9,10 @@
* https://www.openssl.org/source/license.html
*/
{-
use OpenSSL::stackhash qw(generate_stack_macros);
-}
#ifndef OPENSSL_X509_VFY_H
# define OPENSSL_X509_VFY_H
# pragma once
@ -60,9 +66,11 @@ typedef enum {
#define X509_LU_FAIL 0
#endif
DEFINE_OR_DECLARE_STACK_OF(X509_LOOKUP)
DEFINE_OR_DECLARE_STACK_OF(X509_OBJECT)
DEFINE_OR_DECLARE_STACK_OF(X509_VERIFY_PARAM)
{-
generate_stack_macros("X509_LOOKUP")
.generate_stack_macros("X509_OBJECT")
.generate_stack_macros("X509_VERIFY_PARAM");
-}
int X509_STORE_set_depth(X509_STORE *store, int depth);