need to convert the subkeys as well

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1651 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 12 insertions, 0 deletions

diff --git a/src/lib/krb5/asn.1/auth2kauth.c b/src/lib/krb5/asn.1/auth2kauth.c
index 40a342162..b508f5f1c 100644
--- a/src/lib/krb5/asn.1/auth2kauth.c
+++ b/src/lib/krb5/asn.1/auth2kauth.c
@@ -62,6 +62,13 @@ register int *error;
 	krb5_free_authenticator(retval);
 	return(0);
     }
+    if (val->subkey) {
+	retval->subkey = KRB5_EncryptionKey2krb5_keyblock(val->subkey, error);
+	if (!retval->subkey) {
+	    krb5_free_authenticator(retval);
+	    return(0);
+	}
+    }
     if (val->optionals & opt_KRB5_Authenticator_seq__number) {
 	retval->seq_number = val->seq__number;
     }
diff --git a/src/lib/krb5/asn.1/kauth2auth.c b/src/lib/krb5/asn.1/kauth2auth.c
index 56e1ba608..13da1a22b 100644
--- a/src/lib/krb5/asn.1/kauth2auth.c
+++ b/src/lib/krb5/asn.1/kauth2auth.c
@@ -64,6 +64,11 @@ register int *error;
     if (!retval->ctime) {
 	goto errout;
     }
+    if (val->subkey) {
+	retval->subkey = krb5_keyblock2KRB5_EncryptionKey(val->subkey, error);
+	if (!retval->subkey)
+	    goto errout;
+    }
     if (val->seq_number) {
 	retval->seq__number = val->seq_number;
 	retval->optionals |= opt_KRB5_Authenticator_seq__number;