simplify by using der_put_length_and_tag
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7054 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		@@ -215,13 +215,7 @@ encode_integer (unsigned char *p, size_t len, int *data, size_t *size)
 | 
				
			|||||||
    p -= l;
 | 
					    p -= l;
 | 
				
			||||||
    len -= l;
 | 
					    len -= l;
 | 
				
			||||||
    ret += l;
 | 
					    ret += l;
 | 
				
			||||||
    e = der_put_length (p, len, l, &l);
 | 
					    e = der_put_length_and_tag (p, len, l, UNIV, PRIM, UT_Integer, &l);
 | 
				
			||||||
    if (e)
 | 
					 | 
				
			||||||
	return e;
 | 
					 | 
				
			||||||
    p -= l;
 | 
					 | 
				
			||||||
    len -= l;
 | 
					 | 
				
			||||||
    ret += l;
 | 
					 | 
				
			||||||
    e = der_put_tag (p, len, UNIV, PRIM, UT_Integer, &l);
 | 
					 | 
				
			||||||
    if (e)
 | 
					    if (e)
 | 
				
			||||||
	return e;
 | 
						return e;
 | 
				
			||||||
    p -= l;
 | 
					    p -= l;
 | 
				
			||||||
@@ -245,13 +239,7 @@ encode_general_string (unsigned char *p, size_t len,
 | 
				
			|||||||
    p -= l;
 | 
					    p -= l;
 | 
				
			||||||
    len -= l;
 | 
					    len -= l;
 | 
				
			||||||
    ret += l;
 | 
					    ret += l;
 | 
				
			||||||
    e = der_put_length (p, len, l, &l);
 | 
					    e = der_put_length_and_tag (p, len, l, UNIV, PRIM, UT_GeneralString, &l);
 | 
				
			||||||
    if (e)
 | 
					 | 
				
			||||||
	return e;
 | 
					 | 
				
			||||||
    p -= l;
 | 
					 | 
				
			||||||
    len -= l;
 | 
					 | 
				
			||||||
    ret += l;
 | 
					 | 
				
			||||||
    e = der_put_tag (p, len, UNIV, PRIM, UT_GeneralString, &l);
 | 
					 | 
				
			||||||
    if (e)
 | 
					    if (e)
 | 
				
			||||||
	return e;
 | 
						return e;
 | 
				
			||||||
    p -= l;
 | 
					    p -= l;
 | 
				
			||||||
@@ -275,13 +263,7 @@ encode_octet_string (unsigned char *p, size_t len,
 | 
				
			|||||||
    p -= l;
 | 
					    p -= l;
 | 
				
			||||||
    len -= l;
 | 
					    len -= l;
 | 
				
			||||||
    ret += l;
 | 
					    ret += l;
 | 
				
			||||||
    e = der_put_length (p, len, l, &l);
 | 
					    e = der_put_length_and_tag (p, len, l, UNIV, PRIM, UT_OctetString, &l);
 | 
				
			||||||
    if (e)
 | 
					 | 
				
			||||||
	return e;
 | 
					 | 
				
			||||||
    p -= l;
 | 
					 | 
				
			||||||
    len -= l;
 | 
					 | 
				
			||||||
    ret += l;
 | 
					 | 
				
			||||||
    e = der_put_tag (p, len, UNIV, PRIM, UT_OctetString, &l);
 | 
					 | 
				
			||||||
    if (e)
 | 
					    if (e)
 | 
				
			||||||
	return e;
 | 
						return e;
 | 
				
			||||||
    p -= l;
 | 
					    p -= l;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user