Latest update.
This commit is contained in:
+7
-6
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "ssl_locl.h"
|
||||
#include "ssl_local.h"
|
||||
#include <openssl/conf.h>
|
||||
#include <openssl/objects.h>
|
||||
#include <openssl/dh.h>
|
||||
@@ -427,7 +427,7 @@ static int cmd_Certificate(SSL_CONF_CTX *cctx, const char *value)
|
||||
char **pfilename = &cctx->cert_filename[c->key - c->pkeys];
|
||||
OPENSSL_free(*pfilename);
|
||||
*pfilename = OPENSSL_strdup(value);
|
||||
if (!*pfilename)
|
||||
if (*pfilename == NULL)
|
||||
rv = 0;
|
||||
}
|
||||
|
||||
@@ -712,7 +712,7 @@ static const ssl_switch_tbl ssl_cmd_switches[] = {
|
||||
|
||||
static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
|
||||
{
|
||||
if (!pcmd || !*pcmd)
|
||||
if (pcmd == NULL || *pcmd == NULL)
|
||||
return 0;
|
||||
/* If a prefix is set, check and skip */
|
||||
if (cctx->prefix) {
|
||||
@@ -830,13 +830,14 @@ int SSL_CONF_cmd_argv(SSL_CONF_CTX *cctx, int *pargc, char ***pargv)
|
||||
{
|
||||
int rv;
|
||||
const char *arg = NULL, *argn;
|
||||
if (pargc && *pargc == 0)
|
||||
|
||||
if (pargc != NULL && *pargc == 0)
|
||||
return 0;
|
||||
if (!pargc || *pargc > 0)
|
||||
if (pargc == NULL || *pargc > 0)
|
||||
arg = **pargv;
|
||||
if (arg == NULL)
|
||||
return 0;
|
||||
if (!pargc || *pargc > 1)
|
||||
if (pargc == NULL || *pargc > 1)
|
||||
argn = (*pargv)[1];
|
||||
else
|
||||
argn = NULL;
|
||||
|
||||
Reference in New Issue
Block a user