projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT3291: Add -crl and -revoke options to CA.pl
[openssl.git]
/
apps
/
apps.c
diff --git
a/apps/apps.c
b/apps/apps.c
index c5a3bb27e476b4ca8b23760c2cf93e52ed954cba..4eb322afbbf36ddfdf3dceb9a149c5754b98ebdb 100644
(file)
--- a/
apps/apps.c
+++ b/
apps/apps.c
@@
-263,6
+263,8
@@
int str2fmt(char *s)
return(FORMAT_ASN1);
else if ((*s == 'T') || (*s == 't'))
return(FORMAT_TEXT);
return(FORMAT_ASN1);
else if ((*s == 'T') || (*s == 't'))
return(FORMAT_TEXT);
+ else if ((strcmp(s,"NSS") == 0) || (strcmp(s,"nss") == 0))
+ return(FORMAT_NSS);
else if ((*s == 'N') || (*s == 'n'))
return(FORMAT_NETSCAPE);
else if ((*s == 'S') || (*s == 's'))
else if ((*s == 'N') || (*s == 'n'))
return(FORMAT_NETSCAPE);
else if ((*s == 'S') || (*s == 's'))
@@
-392,6
+394,8
@@
int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])
{
arg->count=20;
arg->data=(char **)OPENSSL_malloc(sizeof(char *)*arg->count);
{
arg->count=20;
arg->data=(char **)OPENSSL_malloc(sizeof(char *)*arg->count);
+ if (arg->data == NULL)
+ return 0;
}
for (i=0; i<arg->count; i++)
arg->data[i]=NULL;
}
for (i=0; i<arg->count; i++)
arg->data[i]=NULL;
@@
-588,12
+592,12
@@
int password_callback(char *buf, int bufsiz, int verify,
if (ok >= 0)
ok = UI_add_input_string(ui,prompt,ui_flags,buf,
if (ok >= 0)
ok = UI_add_input_string(ui,prompt,ui_flags,buf,
- PW_MIN_LENGTH,
BUFSIZ
-1);
+ PW_MIN_LENGTH,
bufsiz
-1);
if (ok >= 0 && verify)
{
buff = (char *)OPENSSL_malloc(bufsiz);
ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
if (ok >= 0 && verify)
{
buff = (char *)OPENSSL_malloc(bufsiz);
ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
- PW_MIN_LENGTH,
BUFSIZ
-1, buf);
+ PW_MIN_LENGTH,
bufsiz
-1, buf);
}
if (ok >= 0)
do
}
if (ok >= 0)
do
@@
-1661,6
+1665,8
@@
char *make_config_name()
len=strlen(t)+strlen(OPENSSL_CONF)+2;
p=OPENSSL_malloc(len);
len=strlen(t)+strlen(OPENSSL_CONF)+2;
p=OPENSSL_malloc(len);
+ if (p == NULL)
+ return NULL;
BUF_strlcpy(p,t,len);
#ifndef OPENSSL_SYS_VMS
BUF_strlcat(p,"/",len);
BUF_strlcpy(p,t,len);
#ifndef OPENSSL_SYS_VMS
BUF_strlcat(p,"/",len);
@@
-2382,7
+2388,8
@@
int args_verify(char ***pargs, int *pargc,
char *arg = **pargs, *argn = (*pargs)[1];
const X509_VERIFY_PARAM *vpm = NULL;
time_t at_time = 0;
char *arg = **pargs, *argn = (*pargs)[1];
const X509_VERIFY_PARAM *vpm = NULL;
time_t at_time = 0;
- const unsigned char *hostname = NULL, *email = NULL;
+ char *hostname = NULL;
+ char *email = NULL;
char *ipasc = NULL;
if (!strcmp(arg, "-policy"))
{
char *ipasc = NULL;
if (!strcmp(arg, "-policy"))
{
@@
-2476,14
+2483,14
@@
int args_verify(char ***pargs, int *pargc,
{
if (!argn)
*badarg = 1;
{
if (!argn)
*badarg = 1;
- hostname =
(unsigned char *)
argn;
+ hostname = argn;
(*pargs)++;
}
else if (strcmp(arg,"-verify_email") == 0)
{
if (!argn)
*badarg = 1;
(*pargs)++;
}
else if (strcmp(arg,"-verify_email") == 0)
{
if (!argn)
*badarg = 1;
- email =
(unsigned char *)
argn;
+ email = argn;
(*pargs)++;
}
else if (strcmp(arg,"-verify_ip") == 0)
(*pargs)++;
}
else if (strcmp(arg,"-verify_ip") == 0)
@@
-2954,8
+2961,8
@@
unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
#endif /* ndef OPENSSL_NO_TLSEXT */
void print_cert_checks(BIO *bio, X509 *x,
#endif /* ndef OPENSSL_NO_TLSEXT */
void print_cert_checks(BIO *bio, X509 *x,
- const
unsigned
char *checkhost,
- const
unsigned
char *checkemail,
+ const char *checkhost,
+ const char *checkemail,
const char *checkip)
{
if (x == NULL)
const char *checkip)
{
if (x == NULL)
@@
-2963,7
+2970,8
@@
void print_cert_checks(BIO *bio, X509 *x,
if (checkhost)
{
BIO_printf(bio, "Hostname %s does%s match certificate\n",
if (checkhost)
{
BIO_printf(bio, "Hostname %s does%s match certificate\n",
- checkhost, X509_check_host(x, checkhost, 0, 0)
+ checkhost,
+ X509_check_host(x, checkhost, 0, 0, NULL)
? "" : " NOT");
}
? "" : " NOT");
}
@@
-3133,7
+3141,7
@@
double app_tminterval(int stop,int usertime)
if (proc==NULL)
{
if (proc==NULL)
{
- if (
GetVersion() < 0x80000000
)
+ if (
check_winnt()
)
proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,
GetCurrentProcessId());
if (proc==NULL) proc = (HANDLE)-1;
proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,
GetCurrentProcessId());
if (proc==NULL) proc = (HANDLE)-1;