projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix (most) WIN32 warnings and errors.
[openssl.git]
/
apps
/
asn1pars.c
diff --git
a/apps/asn1pars.c
b/apps/asn1pars.c
index dc41da38a01437d8fee6450d402d189ef662273f..b1a7c8e5dbf8b592c2efbee1940f178616edf523 100644
(file)
--- a/
apps/asn1pars.c
+++ b/
apps/asn1pars.c
@@
-94,6
+94,7
@@
int MAIN(int argc, char **argv)
char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
char *genstr=NULL, *genconf=NULL;
unsigned char *tmpbuf;
char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
char *genstr=NULL, *genconf=NULL;
unsigned char *tmpbuf;
+ const unsigned char *ctmpbuf;
BUF_MEM *buf=NULL;
STACK *osk=NULL;
ASN1_TYPE *at=NULL;
BUF_MEM *buf=NULL;
STACK *osk=NULL;
ASN1_TYPE *at=NULL;
@@
-195,7
+196,7
@@
int MAIN(int argc, char **argv)
bad:
BIO_printf(bio_err,"%s [options] <infile\n",prog);
BIO_printf(bio_err,"where options are\n");
bad:
BIO_printf(bio_err,"%s [options] <infile\n",prog);
BIO_printf(bio_err,"where options are\n");
- BIO_printf(bio_err," -inform arg input format - one of DER
TXT
PEM\n");
+ BIO_printf(bio_err," -inform arg input format - one of DER PEM\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file (output format is always DER\n");
BIO_printf(bio_err," -noout arg don't produce any output\n");
BIO_printf(bio_err," -in arg input file\n");
BIO_printf(bio_err," -out arg output file (output format is always DER\n");
BIO_printf(bio_err," -noout arg don't produce any output\n");
@@
-308,6
+309,7
@@
bad:
for (i=0; i<sk_num(osk); i++)
{
ASN1_TYPE *atmp;
for (i=0; i<sk_num(osk); i++)
{
ASN1_TYPE *atmp;
+ int typ;
j=atoi(sk_value(osk,i));
if (j == 0)
{
j=atoi(sk_value(osk,i));
if (j == 0)
{
@@
-317,7
+319,8
@@
bad:
tmpbuf+=j;
tmplen-=j;
atmp = at;
tmpbuf+=j;
tmplen-=j;
atmp = at;
- at = d2i_ASN1_TYPE(NULL,&tmpbuf,tmplen);
+ ctmpbuf = tmpbuf;
+ at = d2i_ASN1_TYPE(NULL,&ctmpbuf,tmplen);
ASN1_TYPE_free(atmp);
if(!at)
{
ASN1_TYPE_free(atmp);
if(!at)
{
@@
-325,6
+328,15
@@
bad:
ERR_print_errors(bio_err);
goto end;
}
ERR_print_errors(bio_err);
goto end;
}
+ typ = ASN1_TYPE_get(at);
+ if ((typ == V_ASN1_OBJECT)
+ || (typ == V_ASN1_NULL))
+ {
+ BIO_printf(bio_err, "Can't parse %s type\n",
+ typ == V_ASN1_NULL ? "NULL" : "OBJECT");
+ ERR_print_errors(bio_err);
+ goto end;
+ }
/* hmm... this is a little evil but it works */
tmpbuf=at->value.asn1_string->data;
tmplen=at->value.asn1_string->length;
/* hmm... this is a little evil but it works */
tmpbuf=at->value.asn1_string->data;
tmplen=at->value.asn1_string->length;
@@
-333,7
+345,15
@@
bad:
num=tmplen;
}
num=tmplen;
}
- if (length == 0) length=(unsigned int)num;
+ if (offset >= num)
+ {
+ BIO_printf(bio_err, "Error: offset too large\n");
+ goto end;
+ }
+
+ num -= offset;
+
+ if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
if(derout) {
if(BIO_write(derout, str + offset, length) != (int)length) {
BIO_printf(bio_err, "Error writing output\n");
if(derout) {
if(BIO_write(derout, str + offset, length) != (int)length) {
BIO_printf(bio_err, "Error writing output\n");
@@
-361,7
+381,7
@@
end:
if (osk != NULL) sk_free(osk);
OBJ_cleanup();
apps_shutdown();
if (osk != NULL) sk_free(osk);
OBJ_cleanup();
apps_shutdown();
- EXIT(ret);
+
OPENSSL_
EXIT(ret);
}
static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
}
static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)