mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use #error in openssl/srp.h

Browse Source 
Follow the same convention the other OPENSSL_NO_xxx header files
do, and use #error instead of making the header file be a no-op.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Rich Salz 2015-05-14 15:21:36 -04:00 committed by Rich Salz
parent 2eb264a14b
commit 857048a7f3
5 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/s_client.c
View File

@ -925,6 +925,13 @@ int s_client_main(int argc, char **argv)
srp_arg.amp = 1;
meth = TLSv1_client_method();
break;
#else
case OPT_SRPUSER:
case OPT_SRPPASS:
case OPT_SRP_STRENGTH:
case OPT_SRP_LATEUSER:
case OPT_SRP_MOREGROUPS:
break;
#endif
#ifndef OPENSSL_NO_SSL3
case OPT_SSL3:

4
apps/s_server.c
View File

@ -1317,6 +1317,10 @@ int s_server_main(int argc, char *argv[])
srpuserseed = opt_arg();
meth = TLSv1_server_method();
break;
#else
case OPT_SRPVFILE:
case OPT_SRPUSERSEED:
break;
#endif
case OPT_REV:
rev = 1;

6
apps/srp.c
View File

@ -680,4 +680,10 @@ int srp_main(int argc, char **argv)
return (ret);
}
#else
# if PEDANTIC
static void *dummy = &dummy;
# endif
#endif

53
include/openssl/srp.h
View File

@ -60,18 +60,22 @@
#ifndef __SRP_H__
# define __SRP_H__
# ifndef OPENSSL_NO_SRP
#include <openssl/opensslconf.h>
# include <stdio.h>
# include <string.h>
# ifdef OPENSSL_NO_SRP
# error SRP is disabled.
# endif
# include <stdio.h>
# include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
# include <openssl/safestack.h>
# include <openssl/bn.h>
# include <openssl/crypto.h>
# include <openssl/safestack.h>
# include <openssl/bn.h>
# include <openssl/crypto.h>
typedef struct SRP_gN_cache_st {
char *b64_bn;
@ -122,25 +126,25 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
BIGNUM **verifier, const BIGNUM *N,
const BIGNUM *g);
# define SRP_NO_ERROR 0
# define SRP_ERR_VBASE_INCOMPLETE_FILE 1
# define SRP_ERR_VBASE_BN_LIB 2
# define SRP_ERR_OPEN_FILE 3
# define SRP_ERR_MEMORY 4
# define SRP_NO_ERROR 0
# define SRP_ERR_VBASE_INCOMPLETE_FILE 1
# define SRP_ERR_VBASE_BN_LIB 2
# define SRP_ERR_OPEN_FILE 3
# define SRP_ERR_MEMORY 4
# define DB_srptype 0
# define DB_srpverifier 1
# define DB_srpsalt 2
# define DB_srpid 3
# define DB_srpgN 4
# define DB_srpinfo 5
# undef DB_NUMBER
# define DB_NUMBER 6
# define DB_srptype 0
# define DB_srpverifier 1
# define DB_srpsalt 2
# define DB_srpid 3
# define DB_srpgN 4
# define DB_srpinfo 5
# undef DB_NUMBER
# define DB_NUMBER 6
# define DB_SRP_INDEX 'I'
# define DB_SRP_VALID 'V'
# define DB_SRP_REVOKED 'R'
# define DB_SRP_MODIF 'v'
# define DB_SRP_INDEX 'I'
# define DB_SRP_VALID 'V'
# define DB_SRP_REVOKED 'R'
# define DB_SRP_MODIF 'v'
/* see srp.c */
char *SRP_check_known_gN_param(BIGNUM *g, BIGNUM *N);
@ -160,11 +164,10 @@ BIGNUM *SRP_Calc_client_key(BIGNUM *N, BIGNUM *B, BIGNUM *g, BIGNUM *x,
BIGNUM *a, BIGNUM *u);
int SRP_Verify_B_mod_N(BIGNUM *B, BIGNUM *N);
# define SRP_MINIMAL_N 1024
# define SRP_MINIMAL_N 1024
#ifdef __cplusplus
}
#endif
# endif
#endif

2
ssl/tls_srp.c
View File

@ -60,11 +60,11 @@
#include <openssl/crypto.h>
#include <openssl/rand.h>
#include <openssl/srp.h>
#include <openssl/err.h>
#include "ssl_locl.h"
#ifndef OPENSSL_NO_SRP
#include <openssl/srp.h>
int SSL_CTX_SRP_CTX_free(struct ssl_ctx_st *ctx)
{