diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c
index 57506c911..bce53295f 100644
--- a/lib/gssapi/get_mic.c
+++ b/lib/gssapi/get_mic.c
@@ -48,7 +48,7 @@ OM_uint32 gss_get_mic
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c
index 92c729df6..be801a7a2 100644
--- a/lib/gssapi/init_sec_context.c
+++ b/lib/gssapi/init_sec_context.c
@@ -151,9 +151,9 @@ init_auth
   }
 
   (*context_handle)->auth_context->key.keytype = cred->session.keytype;
-  krb5_data_copy (&(*context_handle)->auth_context->key.contents,
-		  cred->session.contents.data,
-		  cred->session.contents.length);
+  krb5_data_copy (&(*context_handle)->auth_context->key.keyvalue,
+		  cred->session.keyvalue.data,
+		  cred->session.keyvalue.length);
 
   kret = create_8003_checksum (input_chan_bindings,
 			       flags,
diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c
index 57506c911..bce53295f 100644
--- a/lib/gssapi/krb5/get_mic.c
+++ b/lib/gssapi/krb5/get_mic.c
@@ -48,7 +48,7 @@ OM_uint32 gss_get_mic
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index 92c729df6..be801a7a2 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -151,9 +151,9 @@ init_auth
   }
 
   (*context_handle)->auth_context->key.keytype = cred->session.keytype;
-  krb5_data_copy (&(*context_handle)->auth_context->key.contents,
-		  cred->session.contents.data,
-		  cred->session.contents.length);
+  krb5_data_copy (&(*context_handle)->auth_context->key.keyvalue,
+		  cred->session.keyvalue.data,
+		  cred->session.keyvalue.length);
 
   kret = create_8003_checksum (input_chan_bindings,
 			       flags,
diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c
index 59c17125c..c451c3843 100644
--- a/lib/gssapi/krb5/unwrap.c
+++ b/lib/gssapi/krb5/unwrap.c
@@ -50,7 +50,7 @@ OM_uint32 gss_unwrap
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
index 1cd19a635..1d38511ae 100644
--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -47,7 +47,7 @@ OM_uint32 gss_verify_mic
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c
index fa7a5d432..fc70204c7 100644
--- a/lib/gssapi/krb5/wrap.c
+++ b/lib/gssapi/krb5/wrap.c
@@ -53,7 +53,7 @@ OM_uint32 gss_wrap
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c
index 59c17125c..c451c3843 100644
--- a/lib/gssapi/unwrap.c
+++ b/lib/gssapi/unwrap.c
@@ -50,7 +50,7 @@ OM_uint32 gss_unwrap
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c
index 1cd19a635..1d38511ae 100644
--- a/lib/gssapi/verify_mic.c
+++ b/lib/gssapi/verify_mic.c
@@ -47,7 +47,7 @@ OM_uint32 gss_verify_mic
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,
diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c
index fa7a5d432..fc70204c7 100644
--- a/lib/gssapi/wrap.c
+++ b/lib/gssapi/wrap.c
@@ -53,7 +53,7 @@ OM_uint32 gss_wrap
   md5_finito (&md5, hash);
 
   memset (&zero, 0, sizeof(zero));
-  memcpy (&key, context_handle->auth_context->key.contents.data,
+  memcpy (&key, context_handle->auth_context->key.keyvalue.data,
 	  sizeof(key));
   des_set_key (&key, schedule);
   des_cbc_cksum ((des_cblock *)hash,