diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
| commit | 4386445c180179aa446a3f52b06f27c665169b97 (patch) | |
| tree | 8a6985f406a9449148ffbddac844117b679bccc5 /apps/pkcs12.c | |
| parent | a585aa67507f8916f592e37b0fa8618e2bbbe08c (diff) | |
Change STRING to OPENSSL_STRING etc as common words such
as "STRING" cause conflicts with other headers/libraries.
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 39686b69db..514a02e0f1 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -117,7 +117,7 @@ int MAIN(int argc, char **argv) int ret = 1; int macver = 1; int noprompt = 0; - STACK_OF(STRING) *canames = NULL; + STACK_OF(OPENSSL_STRING) *canames = NULL; char *cpass = NULL, *mpass = NULL; char *passargin = NULL, *passargout = NULL, *passarg = NULL; char *passin = NULL, *passout = NULL; @@ -222,8 +222,8 @@ int MAIN(int argc, char **argv) } else if (!strcmp (*args, "-caname")) { if (args[1]) { args++; - if (!canames) canames = sk_STRING_new_null(); - sk_STRING_push(canames, *args); + if (!canames) canames = sk_OPENSSL_STRING_new_null(); + sk_OPENSSL_STRING_push(canames, *args); } else badarg = 1; } else if (!strcmp (*args, "-in")) { if (args[1]) { @@ -549,9 +549,9 @@ int MAIN(int argc, char **argv) /* Add any CA names */ - for (i = 0; i < sk_STRING_num(canames); i++) + for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++) { - catmp = (unsigned char *)sk_STRING_value(canames, i); + catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i); X509_alias_set1(sk_X509_value(certs, i), catmp, -1); } @@ -687,7 +687,7 @@ int MAIN(int argc, char **argv) #endif BIO_free(in); BIO_free_all(out); - if (canames) sk_STRING_free(canames); + if (canames) sk_OPENSSL_STRING_free(canames); if(passin) OPENSSL_free(passin); if(passout) OPENSSL_free(passout); apps_shutdown(); |