www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Support for OpenSSL 1.1.0:

Browse Source 
- SRP_VBASE_get_by_user() is deprecated now,
  one should use SRP_VBASE_get1_by_user()
  instead. The new function returns a pointer
  owned by the callee. It must be freed after
  use.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735877 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2016-03-20 13:21:46 +00:00
parent 37b136b29c
commit f048635f6f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ssl/ssl_engine_kernel.c
View File

@@ -2431,17 +2431,27 @@ int ssl_callback_SRPServerParams(SSL *ssl, int *ad, void *arg)
SRP_user_pwd *u; SRP_user_pwd *u;
if (username == NULL if (username == NULL
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|| (u = SRP_VBASE_get_by_user(mctx->srp_vbase, username)) == NULL) { || (u = SRP_VBASE_get_by_user(mctx->srp_vbase, username)) == NULL) {
#else
|| (u = SRP_VBASE_get1_by_user(mctx->srp_vbase, username)) == NULL) {
#endif
*ad = SSL_AD_UNKNOWN_PSK_IDENTITY; *ad = SSL_AD_UNKNOWN_PSK_IDENTITY;
return SSL3_AL_FATAL; return SSL3_AL_FATAL;
} }
if (SSL_set_srp_server_param(ssl, u->N, u->g, u->s, u->v, u->info) < 0) { if (SSL_set_srp_server_param(ssl, u->N, u->g, u->s, u->v, u->info) < 0) {
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
SRP_user_pwd_free(u);
#endif
*ad = SSL_AD_INTERNAL_ERROR; *ad = SSL_AD_INTERNAL_ERROR;
return SSL3_AL_FATAL; return SSL3_AL_FATAL;
} }
/* reset all other options */ /* reset all other options */
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
SRP_user_pwd_free(u);
#endif
SSL_set_verify(ssl, SSL_VERIFY_NONE, ssl_callback_SSLVerify); SSL_set_verify(ssl, SSL_VERIFY_NONE, ssl_callback_SSLVerify);
return SSL_ERROR_NONE; return SSL_ERROR_NONE;
} }