Commit 1f5e0f92 authored by Pauli's avatar Pauli
Browse files

Use safestack.h exclusively internally. 


Remove all stack headers from some includes that don't use them.

Avoid a genearic untyped stack use.

Update stack POD file to include the OPENSSL_sk_ API functions in the notes
section.  They were mentioned in the name section but not defined anywhere.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4430)
parent e431363f

crypto/asn1/tasn_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val, 
        } else if (ret == -1)

            return -1;

        if (!*val)

            *val = (ASN1_VALUE *)OPENSSL_sk_new_null();

            *val = (ASN1_VALUE *)sk_ASN1_VALUE_new_null();

        else {

            /*

             * We've got a valid STACK: free up any items present

crypto/conf/conf_def.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <stdio.h>

#include <string.h>

#include "internal/cryptlib.h"

#include <openssl/stack.h>

#include <openssl/lhash.h>

#include <openssl/conf.h>

#include <openssl/conf_api.h>

crypto/x509/x509_att.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,7 @@ 


#include <stdio.h>

#include "internal/cryptlib.h"

#include <openssl/stack.h>

#include <openssl/safestack.h>

#include <openssl/asn1.h>

#include <openssl/objects.h>

#include <openssl/evp.h>

crypto/x509/x509_ext.c

+1 −2
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@ 


#include <stdio.h>

#include "internal/cryptlib.h"

#include <openssl/stack.h>

#include <openssl/asn1.h>

#include <openssl/objects.h>

#include <openssl/evp.h>

crypto/x509/x509_v3.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,7 @@ 


#include <stdio.h>

#include "internal/cryptlib.h"

#include <openssl/stack.h>

#include <openssl/safestack.h>

#include <openssl/asn1.h>

#include <openssl/objects.h>

#include <openssl/evp.h>