diff options
author | Pauli <paul.dale@oracle.com> | 2017-09-28 12:13:04 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-09-28 13:14:33 +1000 |
commit | 1f5e0f92808b06cb914f69ced71eccd830fb67e3 (patch) | |
tree | 81b72aa0076629cf8610e2740ae2803894a3041e /crypto | |
parent | e431363f8c241abd0dfe9b83dfc1cec1bdfe13ab (diff) |
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: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4430)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/tasn_dec.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_def.c | 1 | ||||
-rw-r--r-- | crypto/x509/x509_att.c | 4 | ||||
-rw-r--r-- | crypto/x509/x509_ext.c | 3 | ||||
-rw-r--r-- | crypto/x509/x509_v3.c | 4 | ||||
-rw-r--r-- | crypto/x509/x509name.c | 4 | ||||
-rw-r--r-- | crypto/x509/x_all.c | 3 |
7 files changed, 9 insertions, 12 deletions
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index c9b637516e..8667bec76a 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -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 diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 65eca6558b..82e191aef3 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -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> diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c index 3876a83323..ff421f19d5 100644 --- a/crypto/x509/x509_att.c +++ b/crypto/x509/x509_att.c @@ -1,5 +1,5 @@ /* - * 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> diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c index 3c59079852..8b1abcd229 100644 --- a/crypto/x509/x509_ext.c +++ b/crypto/x509/x509_ext.c @@ -1,5 +1,5 @@ /* - * 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> diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c index 213e762f98..6bbe23404a 100644 --- a/crypto/x509/x509_v3.c +++ b/crypto/x509/x509_v3.c @@ -1,5 +1,5 @@ /* - * 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> diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c index 2935b17af9..90b1fd04d8 100644 --- a/crypto/x509/x509name.c +++ b/crypto/x509/x509name.c @@ -1,5 +1,5 @@ /* - * 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> diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index 42bd161185..24e4114601 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -1,5 +1,5 @@ /* - * 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/buffer.h> #include <openssl/asn1.h> #include <openssl/evp.h> |