projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preliminary streaming ASN1 encode support.
[openssl.git]
/
crypto
/
asn1
/
asn1_lib.c
diff --git
a/crypto/asn1/asn1_lib.c
b/crypto/asn1/asn1_lib.c
index e84dd5f34b77423743c574604f7758e539655711..3f7b3aad2ad37d5ceb883c254ea65572a74374e8 100644
(file)
--- a/
crypto/asn1/asn1_lib.c
+++ b/
crypto/asn1/asn1_lib.c
@@
-57,6
+57,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include <limits.h>
#include "cryptlib.h"
#include <openssl/asn1.h>
#include <openssl/asn1_mac.h>
#include "cryptlib.h"
#include <openssl/asn1.h>
#include <openssl/asn1_mac.h>
@@
-124,15
+125,13
@@
int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
(int)(omax+ *pp));
#endif
(int)(omax+ *pp));
#endif
-#if 0
- if ((p+ *plength) > (omax+ *pp))
+ if (*plength > (omax - (p - *pp)))
{
ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
/* Set this so that even if things are not long enough
* the values are set correctly */
ret|=0x80;
}
{
ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
/* Set this so that even if things are not long enough
* the values are set correctly */
ret|=0x80;
}
-#endif
*pp=p;
return(ret|inf);
err:
*pp=p;
return(ret|inf);
err:
@@
-143,7
+142,7
@@
err:
static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
{
unsigned char *p= *pp;
static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
{
unsigned char *p= *pp;
- long ret=0;
+
unsigned
long ret=0;
int i;
if (max-- < 1) return(0);
int i;
if (max-- < 1) return(0);
@@
-159,6
+158,8
@@
static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
i= *p&0x7f;
if (*(p++) & 0x80)
{
i= *p&0x7f;
if (*(p++) & 0x80)
{
+ if (i > sizeof(long))
+ return 0;
if (max-- == 0) return(0);
while (i-- > 0)
{
if (max-- == 0) return(0);
while (i-- > 0)
{
@@
-170,8
+171,10
@@
static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
else
ret=i;
}
else
ret=i;
}
+ if (ret > LONG_MAX)
+ return 0;
*pp=p;
*pp=p;
- *rl=ret;
+ *rl=
(long)
ret;
return(1);
}
return(1);
}
@@
-181,7
+184,7
@@
void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
int xclass)
{
unsigned char *p= *pp;
int xclass)
{
unsigned char *p= *pp;
- int i;
+ int i
, ttag
;
i=(constructed)?V_ASN1_CONSTRUCTED:0;
i|=(xclass&V_ASN1_PRIVATE);
i=(constructed)?V_ASN1_CONSTRUCTED:0;
i|=(xclass&V_ASN1_PRIVATE);
@@
-190,20
+193,32
@@
void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
else
{
*(p++)=i|V_ASN1_PRIMITIVE_TAG;
else
{
*(p++)=i|V_ASN1_PRIMITIVE_TAG;
- while (tag > 0x7f)
+ for(i = 0, ttag = tag; ttag > 0; i++) ttag >>=7;
+ ttag = i;
+ while(i-- > 0)
{
{
- *(p++)=(tag&0x7f)|0x80;
- tag>>=7;
+ p[i] = tag & 0x7f;
+ if(i != (ttag - 1)) p[i] |= 0x80;
+ tag >>= 7;
}
}
-
*(p++)=(tag&0x7f)
;
+
p += ttag
;
}
}
- if (
(constructed == 2) && (length == 0)
)
- *(p++)=0x80;
/* der_put_length would output 0 instead */
+ if (
constructed == 2
)
+ *(p++)=0x80;
else
asn1_put_length(&p,length);
*pp=p;
}
else
asn1_put_length(&p,length);
*pp=p;
}
+int ASN1_put_eoc(unsigned char **pp)
+ {
+ unsigned char *p = *pp;
+ *p++ = 0;
+ *p++ = 0;
+ *pp = p;
+ return 2;
+ }
+
static void asn1_put_length(unsigned char **pp, int length)
{
unsigned char *p= *pp;
static void asn1_put_length(unsigned char **pp, int length)
{
unsigned char *p= *pp;
@@
-241,8
+256,8
@@
int ASN1_object_size(int constructed, int length, int tag)
ret++;
}
}
ret++;
}
}
- if (
(length == 0) && (constructed == 2)
)
- ret
+=2
;
+ if (
constructed == 2
)
+ ret
urn ret + 3
;
ret++;
if (length > 127)
{
ret++;
if (length > 127)
{
@@
-335,9
+350,9
@@
int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
{
c=str->data;
if (c == NULL)
{
c=str->data;
if (c == NULL)
- str->data=
M
alloc(len+1);
+ str->data=
OPENSSL_m
alloc(len+1);
else
else
- str->data=
R
ealloc(c,len+1);
+ str->data=
OPENSSL_r
ealloc(c,len+1);
if (str->data == NULL)
{
if (str->data == NULL)
{
@@
-365,7
+380,7
@@
ASN1_STRING *ASN1_STRING_type_new(int type)
{
ASN1_STRING *ret;
{
ASN1_STRING *ret;
- ret=(ASN1_STRING *)
M
alloc(sizeof(ASN1_STRING));
+ ret=(ASN1_STRING *)
OPENSSL_m
alloc(sizeof(ASN1_STRING));
if (ret == NULL)
{
ASN1err(ASN1_F_ASN1_STRING_TYPE_NEW,ERR_R_MALLOC_FAILURE);
if (ret == NULL)
{
ASN1err(ASN1_F_ASN1_STRING_TYPE_NEW,ERR_R_MALLOC_FAILURE);
@@
-381,8
+396,8
@@
ASN1_STRING *ASN1_STRING_type_new(int type)
void ASN1_STRING_free(ASN1_STRING *a)
{
if (a == NULL) return;
void ASN1_STRING_free(ASN1_STRING *a)
{
if (a == NULL) return;
- if (a->data != NULL)
F
ree(a->data);
-
F
ree(a);
+ if (a->data != NULL)
OPENSSL_f
ree(a->data);
+
OPENSSL_f
ree(a);
}
int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
}
int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
@@
-404,7
+419,7
@@
int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
void asn1_add_error(unsigned char *address, int offset)
{
void asn1_add_error(unsigned char *address, int offset)
{
- char buf1[
16],buf2[16
];
+ char buf1[
DECIMAL_SIZE(address)+1],buf2[DECIMAL_SIZE(offset)+1
];
sprintf(buf1,"%lu",(unsigned long)address);
sprintf(buf2,"%d",offset);
sprintf(buf1,"%lu",(unsigned long)address);
sprintf(buf2,"%d",offset);
@@
-421,4
+436,4
@@
int ASN1_STRING_type(ASN1_STRING *x)
{ return M_ASN1_STRING_type(x); }
unsigned char * ASN1_STRING_data(ASN1_STRING *x)
{ return M_ASN1_STRING_type(x); }
unsigned char * ASN1_STRING_data(ASN1_STRING *x)
-{ return ASN1_STRING_data(x); }
+{ return
M_
ASN1_STRING_data(x); }