diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 05:36:07 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 05:36:07 +0100 |
| commit | 228c5c17dd30d7640072462f5334f96835507e11 (patch) | |
| tree | aac5e57fb3e6452d762ae02b868f362a463781dd /usr/src/lib/libsmbfs/smb/derparse.c | |
| parent | 223b8c65a9498294013b99c37d5b9024433237ec (diff) | |
| download | illumos-joyent-228c5c17dd30d7640072462f5334f96835507e11.tar.gz | |
1823 smb der parser should cast to unsigned char when expecting it
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/lib/libsmbfs/smb/derparse.c')
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/derparse.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/usr/src/lib/libsmbfs/smb/derparse.c b/usr/src/lib/libsmbfs/smb/derparse.c index 0180e064ed..f92da913c2 100644 --- a/usr/src/lib/libsmbfs/smb/derparse.c +++ b/usr/src/lib/libsmbfs/smb/derparse.c @@ -37,15 +37,16 @@ #pragma error_messages (off,E_INITIALIZATION_TYPE_MISMATCH) MECH_OID g_stcMechOIDList [] = { - {"\x06\x09\x2a\x86\x48\x82\xf7\x12\x01\x02\x02", 11, 9, - spnego_mech_oid_Kerberos_V5_Legacy }, // 1.2.840.48018.1.2.2 - {"\x06\x09\x2a\x86\x48\x86\xf7\x12\x01\x02\x02", 11, 9, - spnego_mech_oid_Kerberos_V5 }, // 1.2.840.113554.1.2.2 - {"\x06\x06\x2b\x06\x01\x05\x05\x02", 8, 6, - spnego_mech_oid_Spnego }, // 1.3.6.1.5.5.2 - {"\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a", 12, 10, - spnego_mech_oid_NTLMSSP }, // 1.3.6.1.4.1.311.2.2.10 - {"", 0, 0, spnego_mech_oid_NotUsed } // Placeholder + {(unsigned char *)"\x06\x09\x2a\x86\x48\x82\xf7\x12\x01\x02\x02", + 11, 9, spnego_mech_oid_Kerberos_V5_Legacy}, // 1.2.840.48018.1.2.2 + {(unsigned char *)"\x06\x09\x2a\x86\x48\x86\xf7\x12\x01\x02\x02", + 11, 9, spnego_mech_oid_Kerberos_V5}, // 1.2.840.113554.1.2.2 + {(unsigned char *)"\x06\x06\x2b\x06\x01\x05\x05\x02", + 8, 6, spnego_mech_oid_Spnego}, // 1.3.6.1.5.5.2 + {(unsigned char *)"\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a", + 12, 10, spnego_mech_oid_NTLMSSP}, // 1.3.6.1.4.1.311.2.2.10 + {(unsigned char *)"", 0, 0, spnego_mech_oid_NotUsed // Placeholder + } }; #pragma error_messages (default,E_INITIALIZATION_TYPE_MISMATCH) |