mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix safestack issues in srp.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:31:44 +01:00
parent 02199cc39d
commit 22fbfe6a7d
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -31,6 +31,7 @@
/include/openssl/opensslv.h
/include/openssl/pkcs7.h
/include/openssl/safestack.h
/include/openssl/srp.h
/include/openssl/ssl.h
/include/openssl/x509.h
/include/openssl/x509v3.h

2
build.info
View File

@ -22,6 +22,7 @@ DEPEND[]=include/openssl/asn1.h \
include/openssl/ocsp.h \
include/openssl/pkcs7.h \
include/openssl/safestack.h \
include/openssl/srp.h \
include/openssl/ssl.h \
include/openssl/x509.h \
include/openssl/x509v3.h \
@ -37,6 +38,7 @@ GENERATE[include/openssl/ocsp.h]=include/openssl/ocsp.h.in
GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in
GENERATE[include/openssl/pkcs7.h]=include/openssl/pkcs7.h.in
GENERATE[include/openssl/safestack.h]=include/openssl/safestack.h.in
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

4
crypto/srp/srp_vfy.c
View File

@ -25,10 +25,6 @@
# define SRP_RANDOM_SALT_LEN 20
# define MAX_LEN 2500
DEFINE_STACK_OF(SRP_user_pwd)
DEFINE_STACK_OF(SRP_gN_cache)
DEFINE_STACK_OF(SRP_gN)
/*
* Note that SRP uses its own variant of base 64 encoding. A different base64
* alphabet is used and no padding '=' characters are added. Instead we pad to

20
include/openssl/srp.h → include/openssl/srp.h.in
View File

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

2
test/sslapitest.c
View File

@ -5939,8 +5939,6 @@ static int test_pha_key_update(void)
static SRP_VBASE *vbase = NULL;
DEFINE_STACK_OF(SRP_user_pwd)
static int ssl_srp_cb(SSL *s, int *ad, void *arg)
{
int ret = SSL3_AL_FATAL;