summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-09-03 15:31:44 +0100
committerMatt Caswell <matt@openssl.org>2020-09-13 11:10:41 +0100
commit22fbfe6a7d13c7c9417f8a10103d28fe70991e94 (patch)
treebcbfa0c2846db8b42679a5a84e9e97787b687765 /include
parent02199cc39db2669933cefc6319599ba491bb3a85 (diff)
Fix safestack issues in srp.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)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/srp.h.in (renamed from include/openssl/srp.h)20
1 files changed, 17 insertions, 3 deletions
diff --git a/include/openssl/srp.h b/include/openssl/srp.h.in
index 5c8f5368f8..7ea855d9a0 100644
--- a/include/openssl/srp.h
+++ b/include/openssl/srp.h.in
@@ -1,4 +1,6 @@
/*
+ * {- join("\n * ", @autowarntext) -}
+ *
* Copyright 2004-2020 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2004, EdelKey Project. All Rights Reserved.
*
@@ -11,6 +13,10 @@
* for the EdelKey project.
*/
+{-
+use OpenSSL::stackhash qw(generate_stack_macros);
+-}
+
#ifndef OPENSSL_SRP_H
# define OPENSSL_SRP_H
# pragma once
@@ -37,7 +43,10 @@ typedef struct SRP_gN_cache_st {
char *b64_bn;
BIGNUM *bn;
} SRP_gN_cache;
-DEFINE_OR_DECLARE_STACK_OF(SRP_gN_cache)
+{-
+ generate_stack_macros("SRP_gN_cache");
+-}
+
typedef struct SRP_user_pwd_st {
/* Owned by us. */
@@ -50,7 +59,9 @@ typedef struct SRP_user_pwd_st {
/* Owned by us. */
char *info;
} SRP_user_pwd;
-DEFINE_OR_DECLARE_STACK_OF(SRP_user_pwd)
+{-
+ generate_stack_macros("SRP_user_pwd");
+-}
SRP_user_pwd *SRP_user_pwd_new(void);
void SRP_user_pwd_free(SRP_user_pwd *user_pwd);
@@ -76,7 +87,10 @@ typedef struct SRP_gN_st {
const BIGNUM *g;
const BIGNUM *N;
} SRP_gN;
-DEFINE_OR_DECLARE_STACK_OF(SRP_gN)
+{-
+ generate_stack_macros("SRP_gN");
+-}
+
SRP_VBASE *SRP_VBASE_new(char *seed_key);
void SRP_VBASE_free(SRP_VBASE *vb);