svn rev #25607: trunk/src/lib/krb5/asn.1/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25607
Commit By: ghudson
Log Message:
Fix asn1_encode_subject_pk_info without params

r20923 inadvertently broke asn1_encode_subject_pk_info in the case
where algorithm.parameters.length == 0.  Fortunately this case never
happens, but fix it anyway.


Changed Files:
U   trunk/src/lib/krb5/asn.1/asn1_k_encode.c
Modified: trunk/src/lib/krb5/asn.1/asn1_k_encode.c
===================================================================
--- trunk/src/lib/krb5/asn.1/asn1_k_encode.c	2012-01-04 15:47:52 UTC (rev 25606)
+++ trunk/src/lib/krb5/asn.1/asn1_k_encode.c	2012-01-06 20:46:17 UTC (rev 25607)
@@ -1762,14 +1762,16 @@
     }
 
     if (val->algorithm.parameters.length != 0) {
-        unsigned int length;
-
         retval = asn1buf_insert_octetstring(buf, val->algorithm.parameters.length,
                                             val->algorithm.parameters.data);
         if (retval)
             return retval;
         sum += val->algorithm.parameters.length;
+    }
 
+    {
+        unsigned int length;
+
         retval = asn1_encode_oid(buf, val->algorithm.algorithm.length,
                                  val->algorithm.algorithm.data,
                                  &length);