← Back to branch summary

~ubuntu-branches/ubuntu/maverick/krb5/maverick

« back to all changes in this revision

Viewing changes to src/lib/crypto/cksumtypes.c

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hartman
  • Date: 2009-05-07 16:16:34 UTC
  • mfrom: (13.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090507161634-xqyk0s9na0le4flj
Tags: 1.7dfsg~beta1-4
http://bugs.debian.org/527353
When  decrypting the TGS response fails with the subkey, try with the
session key to work around Heimdal bug, Closes: #527353 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/crypto/cksumtypes.c
31
31
 
32
32
const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
33
33
    { CKSUMTYPE_CRC32, KRB5_CKSUMFLAG_NOT_COLL_PROOF,
34
 
      "crc32", "CRC-32",
 
34
      "crc32", { 0 }, "CRC-32",
35
35
      0, NULL,
36
36
      &krb5int_hash_crc32 },
37
37
 
38
38
    { CKSUMTYPE_RSA_MD4, 0,
39
 
      "md4", "RSA-MD4",
 
39
      "md4", { 0 }, "RSA-MD4",
40
40
      0, NULL,
41
41
      &krb5int_hash_md4 },
42
42
    { CKSUMTYPE_RSA_MD4_DES, 0,
43
 
      "md4-des", "RSA-MD4 with DES cbc mode",
 
43
      "md4-des", { 0 }, "RSA-MD4 with DES cbc mode",
44
44
      ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_md4des,
45
45
      NULL },
46
46
 
47
47
    { CKSUMTYPE_DESCBC, 0,
48
 
      "des-cbc", "DES cbc mode",
 
48
      "des-cbc", { 0 }, "DES cbc mode",
49
49
      ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_descbc,
50
50
      NULL },
51
51
 
52
52
    { CKSUMTYPE_RSA_MD5, 0,
53
 
      "md5", "RSA-MD5",
 
53
      "md5", { 0 }, "RSA-MD5",
54
54
      0, NULL,
55
55
      &krb5int_hash_md5 },
56
56
    { CKSUMTYPE_RSA_MD5_DES, 0,
57
 
      "md5-des", "RSA-MD5 with DES cbc mode",
 
57
      "md5-des", { 0 }, "RSA-MD5 with DES cbc mode",
58
58
      ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_md5des,
59
59
      NULL },
60
60
 
61
61
    { CKSUMTYPE_NIST_SHA, 0,
62
 
      "sha", "NIST-SHA",
 
62
      "sha", { 0 }, "NIST-SHA",
63
63
      0, NULL,
64
64
      &krb5int_hash_sha1 },
65
65
 
66
66
    { CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
67
 
      "hmac-sha1-des3", "HMAC-SHA1 DES3 key",
68
 
      0, NULL,
69
 
      &krb5int_hash_sha1 },
70
 
    { CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
71
 
      "hmac-sha1-des3-kd", "HMAC-SHA1 DES3 key", /* alias */
72
 
      0, NULL,
73
 
      &krb5int_hash_sha1 },
74
 
    { CKSUMTYPE_HMAC_MD5_ARCFOUR, 0,
75
 
      "hmac-md5-rc4", "Microsoft HMAC MD5 (RC4 key)", 
76
 
      ENCTYPE_ARCFOUR_HMAC, &krb5int_keyhash_hmac_md5,
77
 
      NULL },
78
 
    { CKSUMTYPE_HMAC_MD5_ARCFOUR, 0,
79
 
      "hmac-md5-enc", "Microsoft HMAC MD5 (RC4 key)",  /*Heimdal alias*/
80
 
      ENCTYPE_ARCFOUR_HMAC, &krb5int_keyhash_hmac_md5,
81
 
      NULL },
82
 
    { CKSUMTYPE_HMAC_MD5_ARCFOUR, 0,
83
 
      "hmac-md5-earcfour", "Microsoft HMAC MD5 (RC4 key)",  /* alias*/
 
67
      "hmac-sha1-des3", { "hmac-sha1-des3-kd" }, "HMAC-SHA1 DES3 key",
 
68
      0, NULL,
 
69
      &krb5int_hash_sha1 },
 
70
    { CKSUMTYPE_HMAC_MD5_ARCFOUR, 0,
 
71
      "hmac-md5-rc4", { "hmac-md5-enc", "hmac-md5-earcfour" },
 
72
      "Microsoft HMAC MD5 (RC4 key)", 
84
73
      ENCTYPE_ARCFOUR_HMAC, &krb5int_keyhash_hmac_md5,
85
74
      NULL },
86
75
 
87
76
    { CKSUMTYPE_HMAC_SHA1_96_AES128, KRB5_CKSUMFLAG_DERIVE,
88
 
      "hmac-sha1-96-aes128", "HMAC-SHA1 AES128 key",
 
77
      "hmac-sha1-96-aes128", { 0 }, "HMAC-SHA1 AES128 key",
89
78
      0, NULL, 
90
79
      &krb5int_hash_sha1, 12 },
91
80
    { CKSUMTYPE_HMAC_SHA1_96_AES256, KRB5_CKSUMFLAG_DERIVE,
92
 
      "hmac-sha1-96-aes256", "HMAC-SHA1 AES256 key",
 
81
      "hmac-sha1-96-aes256", { 0 }, "HMAC-SHA1 AES256 key",
93
82
      0, NULL, 
94
83
      &krb5int_hash_sha1, 12 },
 
84
    { CKSUMTYPE_MD5_HMAC_ARCFOUR, 0,
 
85
      "md5-hmac-rc4", { 0 }, "Microsoft MD5 HMAC (RC4 key)",
 
86
      ENCTYPE_ARCFOUR_HMAC, &krb5int_keyhash_md5_hmac, 
 
87
      NULL }
95
88
};
96
89
 
97
 
const int krb5_cksumtypes_length =
 
90
const unsigned int krb5_cksumtypes_length =
98
91
sizeof(krb5_cksumtypes_list)/sizeof(struct krb5_cksumtypes);