From fe897df66afdbbcfc79b928e6fbe82ed9473e732 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 28 Sep 1999 03:08:24 +0000
Subject: [PATCH] simplify by using der_put_length_and_tag

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7054 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/der_put.c | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/lib/asn1/der_put.c b/lib/asn1/der_put.c
index 9de9c34fc..5e5fc719a 100644
--- a/lib/asn1/der_put.c
+++ b/lib/asn1/der_put.c
@@ -215,13 +215,7 @@ encode_integer (unsigned char *p, size_t len, int *data, size_t *size)
     p -= l;
     len -= l;
     ret += l;
-    e = der_put_length (p, len, l, &l);
-    if (e)
-	return e;
-    p -= l;
-    len -= l;
-    ret += l;
-    e = der_put_tag (p, len, UNIV, PRIM, UT_Integer, &l);
+    e = der_put_length_and_tag (p, len, l, UNIV, PRIM, UT_Integer, &l);
     if (e)
 	return e;
     p -= l;
@@ -245,13 +239,7 @@ encode_general_string (unsigned char *p, size_t len,
     p -= l;
     len -= l;
     ret += l;
-    e = der_put_length (p, len, l, &l);
-    if (e)
-	return e;
-    p -= l;
-    len -= l;
-    ret += l;
-    e = der_put_tag (p, len, UNIV, PRIM, UT_GeneralString, &l);
+    e = der_put_length_and_tag (p, len, l, UNIV, PRIM, UT_GeneralString, &l);
     if (e)
 	return e;
     p -= l;
@@ -275,13 +263,7 @@ encode_octet_string (unsigned char *p, size_t len,
     p -= l;
     len -= l;
     ret += l;
-    e = der_put_length (p, len, l, &l);
-    if (e)
-	return e;
-    p -= l;
-    len -= l;
-    ret += l;
-    e = der_put_tag (p, len, UNIV, PRIM, UT_OctetString, &l);
+    e = der_put_length_and_tag (p, len, l, UNIV, PRIM, UT_OctetString, &l);
     if (e)
 	return e;
     p -= l;