diff options
Diffstat (limited to 'lib/libcrypto/asn1/f_int.c')
-rw-r--r-- | lib/libcrypto/asn1/f_int.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/lib/libcrypto/asn1/f_int.c b/lib/libcrypto/asn1/f_int.c index 977e3d01b74..66632f2dc44 100644 --- a/lib/libcrypto/asn1/f_int.c +++ b/lib/libcrypto/asn1/f_int.c @@ -62,7 +62,7 @@ #include <openssl/asn1.h> int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a) - { +{ int i,n=0; static const char *h="0123456789ABCDEF"; char buf[2]; @@ -70,38 +70,38 @@ int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a) if (a == NULL) return(0); if (a->type & V_ASN1_NEG) - { + { if (BIO_write(bp, "-", 1) != 1) goto err; n = 1; - } + } if (a->length == 0) - { + { if (BIO_write(bp,"00",2) != 2) goto err; n += 2; - } + } else - { + { for (i=0; i<a->length; i++) - { + { if ((i != 0) && (i%35 == 0)) - { + { if (BIO_write(bp,"\\\n",2) != 2) goto err; n+=2; - } + } buf[0]=h[((unsigned char)a->data[i]>>4)&0x0f]; buf[1]=h[((unsigned char)a->data[i] )&0x0f]; if (BIO_write(bp,buf,2) != 2) goto err; n+=2; - } } + } return(n); err: return(-1); - } +} int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) - { +{ int ret=0; int i,j,k,m,n,again,bufsize; unsigned char *s=NULL,*sp; @@ -112,7 +112,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) bufsize=BIO_gets(bp,buf,size); for (;;) - { + { if (bufsize < 1) goto err_sl; i=bufsize; if (buf[i-1] == '\n') buf[--i]='\0'; @@ -122,15 +122,15 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) again=(buf[i-1] == '\\'); for (j=0; j<i; j++) - { + { if (!( ((buf[j] >= '0') && (buf[j] <= '9')) || ((buf[j] >= 'a') && (buf[j] <= 'f')) || ((buf[j] >= 'A') && (buf[j] <= 'F')))) - { + { i=j; break; - } } + } buf[i]='\0'; /* We have now cleared all the crap off the end of the * line */ @@ -138,42 +138,42 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) bufp=(unsigned char *)buf; if (first) - { + { first=0; if ((bufp[0] == '0') && (buf[1] == '0')) - { + { bufp+=2; i-=2; - } } + } k=0; i-=again; if (i%2 != 0) - { + { ASN1err(ASN1_F_A2I_ASN1_INTEGER,ASN1_R_ODD_NUMBER_OF_CHARS); goto err; - } + } i/=2; if (num+i > slen) - { + { if (s == NULL) sp=(unsigned char *)malloc( (unsigned int)num+i*2); else sp=OPENSSL_realloc_clean(s,slen,num+i*2); if (sp == NULL) - { + { ASN1err(ASN1_F_A2I_ASN1_INTEGER,ERR_R_MALLOC_FAILURE); if (s != NULL) free(s); goto err; - } + } s=sp; slen=num+i*2; - } + } for (j=0; j<i; j++,k+=2) - { + { for (n=0; n<2; n++) - { + { m=bufp[k+n]; if ((m >= '0') && (m <= '9')) m-='0'; @@ -182,29 +182,29 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) else if ((m >= 'A') && (m <= 'F')) m=m-'A'+10; else - { + { ASN1err(ASN1_F_A2I_ASN1_INTEGER,ASN1_R_NON_HEX_CHARACTERS); goto err; - } + } s[num+j]<<=4; s[num+j]|=m; - } } + } num+=i; if (again) bufsize=BIO_gets(bp,buf,size); else break; - } + } bs->length=num; bs->data=s; ret=1; err: if (0) - { + { err_sl: ASN1err(ASN1_F_A2I_ASN1_INTEGER,ASN1_R_SHORT_LINE); - } - return(ret); } + return(ret); +} |