diff options
| author | Viktor Dukhovni <ietf-dane@dukhovni.org> | 2014-07-07 19:11:38 +1000 |
|---|---|---|
| committer | Viktor Dukhovni <ietf-dane@dukhovni.org> | 2014-07-07 19:11:38 +1000 |
| commit | 297c67fcd817ea643de2fdeff4e434b050d571e2 (patch) | |
| tree | 5ff05ff3ed125e5091f9cb75a50c51bb5ff7c397 /apps | |
| parent | ee724df75d9ad67fd954253ac514fddb46f1e3c6 (diff) | |
Update API to use (char *) for email addresses and hostnames
Reduces number of silly casts in OpenSSL code and likely most
applications. Consistent with (char *) for "peername" value from
X509_check_host() and X509_VERIFY_PARAM_get0_peername().
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.c | 11 | ||||
| -rw-r--r-- | apps/apps.h | 4 | ||||
| -rw-r--r-- | apps/x509.c | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/apps/apps.c b/apps/apps.c index 188b2373aa..4eb322afbb 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -2388,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; - const unsigned char *hostname = NULL, *email = NULL; + char *hostname = NULL; + char *email = NULL; char *ipasc = NULL; if (!strcmp(arg, "-policy")) { @@ -2482,14 +2483,14 @@ int args_verify(char ***pargs, int *pargc, { if (!argn) *badarg = 1; - hostname = (unsigned char *)argn; + hostname = argn; (*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) @@ -2960,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, - const unsigned char *checkhost, - const unsigned char *checkemail, + const char *checkhost, + const char *checkemail, const char *checkip) { if (x == NULL) diff --git a/apps/apps.h b/apps/apps.h index b4a9b49ce7..bb076996bf 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -342,8 +342,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, - const unsigned char *checkhost, - const unsigned char *checkemail, + const char *checkhost, + const char *checkemail, const char *checkip); void store_setup_crl_download(X509_STORE *st); diff --git a/apps/x509.c b/apps/x509.c index 1b612d17d4..3bb261010f 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -214,7 +214,8 @@ int MAIN(int argc, char **argv) int need_rand = 0; int checkend=0,checkoffset=0; unsigned long nmflag = 0, certflag = 0; - unsigned char *checkhost = NULL, *checkemail = NULL; + char *checkhost = NULL; + char *checkemail = NULL; char *checkip = NULL; #ifndef OPENSSL_NO_ENGINE char *engine=NULL; @@ -474,12 +475,12 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-checkhost") == 0) { if (--argc < 1) goto bad; - checkhost=(unsigned char *)*(++argv); + checkhost=*(++argv); } else if (strcmp(*argv,"-checkemail") == 0) { if (--argc < 1) goto bad; - checkemail=(unsigned char *)*(++argv); + checkemail=*(++argv); } else if (strcmp(*argv,"-checkip") == 0) { |