Browse Source

Fix safestack issues in ct.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 2 years ago
parent
commit
9d01ac71a0
11 changed files with 14 additions and 18 deletions
  1. +1
    -0
      .gitignore
  2. +0
    -2
      apps/s_client.c
  3. +2
    -0
      build.info
  4. +0
    -2
      crypto/ct/ct_log.c
  5. +0
    -2
      crypto/ct/ct_oct.c
  6. +0
    -2
      crypto/ct/ct_prn.c
  7. +0
    -2
      crypto/ct/ct_sct.c
  8. +0
    -2
      crypto/ct/ct_x509v3.c
  9. +11
    -2
      include/openssl/ct.h.in
  10. +0
    -2
      ssl/ssl_lib.c
  11. +0
    -2
      test/ct_test.c

+ 1
- 0
.gitignore View File

@ -27,6 +27,7 @@
/include/openssl/cms.h
/include/openssl/configuration.h
/include/openssl/crmf.h
/include/openssl/ct.h
/include/openssl/fipskey.h
/include/openssl/ocsp.h
/include/openssl/opensslv.h


+ 0
- 2
apps/s_client.c View File

@ -59,8 +59,6 @@ typedef unsigned int u_int;
# endif
#endif
DEFINE_STACK_OF(SCT)
#undef BUFSIZZ
#define BUFSIZZ 1024*8
#define S_CLIENT_IRC_READ_TIMEOUT 8


+ 2
- 0
build.info View File

@ -18,6 +18,7 @@ DEPEND[]=include/openssl/asn1.h \
include/openssl/cms.h \
include/openssl/configuration.h \
include/openssl/crmf.h \
include/openssl/ct.h \
include/openssl/fipskey.h \
include/openssl/opensslv.h \
include/openssl/ocsp.h \
@ -36,6 +37,7 @@ 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
GENERATE[include/openssl/crmf.h]=include/openssl/crmf.h.in
GENERATE[include/openssl/ct.h]=include/openssl/ct.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


+ 0
- 2
crypto/ct/ct_log.c View File

@ -18,8 +18,6 @@
#include "internal/cryptlib.h"
DEFINE_STACK_OF(CTLOG)
/*
* Information about a CT log server.
*/


+ 0
- 2
crypto/ct/ct_oct.c View File

@ -21,8 +21,6 @@
#include "ct_local.h"
DEFINE_STACK_OF(SCT)
int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len)
{
size_t siglen;


+ 0
- 2
crypto/ct/ct_prn.c View File

@ -16,8 +16,6 @@
#include "ct_local.h"
DEFINE_STACK_OF(SCT)
static void SCT_signature_algorithms_print(const SCT *sct, BIO *out)
{
int nid = SCT_get_signature_nid(sct);


+ 0
- 2
crypto/ct/ct_sct.c View File

@ -19,8 +19,6 @@
#include "ct_local.h"
DEFINE_STACK_OF(SCT)
SCT *SCT_new(void)
{
SCT *sct = OPENSSL_zalloc(sizeof(*sct));


+ 0
- 2
crypto/ct/ct_x509v3.c View File

@ -13,8 +13,6 @@
#include "ct_local.h"
DEFINE_STACK_OF(SCT)
static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
{
return OPENSSL_strdup("NULL");


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


+ 0
- 2
ssl/ssl_lib.c View File

@ -28,8 +28,6 @@
#include "internal/refcount.h"
#include "internal/ktls.h"
DEFINE_STACK_OF(SCT)
static int ssl_undefined_function_1(SSL *ssl, SSL3_RECORD *r, size_t s, int t,
SSL_MAC_BUF *mac, size_t macsize)
{


+ 0
- 2
test/ct_test.c View File

@ -22,8 +22,6 @@
#ifndef OPENSSL_NO_CT
DEFINE_STACK_OF(SCT)
/* Used when declaring buffers to read text files into */
# define CT_TEST_MAX_FILE_SIZE 8096


Loading…
Cancel
Save