diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:10:00 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:10:00 +0000 |
| commit | c869da8839ef5af9df5a4d98f518b079240a0d4b (patch) | |
| tree | 4993ede240e5c1851ad9c32f304ee9f650193173 /apps/asn1pars.c | |
| parent | d80866041ea4a5800a3f4a2ac4b83200eb8fd9c2 (diff) | |
Update from 1.0.0-stable
Diffstat (limited to 'apps/asn1pars.c')
| -rw-r--r-- | apps/asn1pars.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/asn1pars.c b/apps/asn1pars.c index caf6787553..b5d65e725b 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -96,7 +96,7 @@ int MAIN(int argc, char **argv) unsigned char *tmpbuf; const unsigned char *ctmpbuf; BUF_MEM *buf=NULL; - STACK_OF(STRING) *osk=NULL; + STACK_OF(OPENSSL_STRING) *osk=NULL; ASN1_TYPE *at=NULL; informat=FORMAT_PEM; @@ -113,7 +113,7 @@ int MAIN(int argc, char **argv) prog=argv[0]; argc--; argv++; - if ((osk=sk_STRING_new_null()) == NULL) + if ((osk=sk_OPENSSL_STRING_new_null()) == NULL) { BIO_printf(bio_err,"Memory allocation failure\n"); goto end; @@ -169,7 +169,7 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-strparse") == 0) { if (--argc < 1) goto bad; - sk_STRING_push(osk,*(++argv)); + sk_OPENSSL_STRING_push(osk,*(++argv)); } else if (strcmp(*argv,"-genstr") == 0) { @@ -302,18 +302,18 @@ bad: /* If any structs to parse go through in sequence */ - if (sk_STRING_num(osk)) + if (sk_OPENSSL_STRING_num(osk)) { tmpbuf=(unsigned char *)str; tmplen=num; - for (i=0; i<sk_STRING_num(osk); i++) + for (i=0; i<sk_OPENSSL_STRING_num(osk); i++) { ASN1_TYPE *atmp; int typ; - j=atoi(sk_STRING_value(osk,i)); + j=atoi(sk_OPENSSL_STRING_value(osk,i)); if (j == 0) { - BIO_printf(bio_err,"'%s' is an invalid number\n",sk_STRING_value(osk,i)); + BIO_printf(bio_err,"'%s' is an invalid number\n",sk_OPENSSL_STRING_value(osk,i)); continue; } tmpbuf+=j; @@ -378,7 +378,7 @@ end: ERR_print_errors(bio_err); if (buf != NULL) BUF_MEM_free(buf); if (at != NULL) ASN1_TYPE_free(at); - if (osk != NULL) sk_STRING_free(osk); + if (osk != NULL) sk_OPENSSL_STRING_free(osk); OBJ_cleanup(); apps_shutdown(); OPENSSL_EXIT(ret); |