diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-01-06 20:46:17 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-01-06 20:46:17 +0000 |
| commit | 255e1dd08f2398ef23a4ff83f69bb0806c6b76c7 (patch) | |
| tree | 905f6f119a3353ddf78906fafee322bd94db970c /src/lib | |
| parent | ef2a96a8cf63c7d207805aff94fead695993d660 (diff) | |
| download | krb5-255e1dd08f2398ef23a4ff83f69bb0806c6b76c7.tar.gz krb5-255e1dd08f2398ef23a4ff83f69bb0806c6b76c7.tar.xz krb5-255e1dd08f2398ef23a4ff83f69bb0806c6b76c7.zip | |
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.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25607 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 82f99b12b..8aecfdf56 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -1762,13 +1762,15 @@ asn1_encode_subject_pk_info(asn1buf *buf, const krb5_subject_pk_info *val, } 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, |
