auth/kerberos: Move gse_get_session_key() to common code and use in gensec_gssapi
[ira/wip.git] / source3 / include / smb_krb5.h
index bc9996c541dbe0abaf3e20337cc6372a2c117054..152652512d93356ab3770a85e9c6863b5b0ab6ff 100644 (file)
@@ -66,18 +66,6 @@ typedef struct {
 #endif /* defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) */
 } smb_krb5_addresses;
 
-#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */
-#define KRB5_KEY_TYPE(k)       ((k)->keytype)
-#define KRB5_KEY_LENGTH(k)     ((k)->keyvalue.length)
-#define KRB5_KEY_DATA(k)       ((k)->keyvalue.data)
-#define KRB5_KEY_DATA_CAST     void
-#else /* MIT */
-#define KRB5_KEY_TYPE(k)       ((k)->enctype)
-#define KRB5_KEY_LENGTH(k)     ((k)->length)
-#define KRB5_KEY_DATA(k)       ((k)->contents)
-#define KRB5_KEY_DATA_CAST     krb5_octet
-#endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */
-
 #ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY               /* MIT */
 #define KRB5_KT_KEY(k)         (&(k)->key)
 #elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK          /* Heimdal */