summaryrefslogtreecommitdiff
path: root/fs/cifs/asn1.c
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2008-07-24 20:43:34 +0000
committerSteve French <sfrench@us.ibm.com>2008-07-24 20:43:34 +0000
commite2d2867ff8700d7431c68c089ff5f5ed7f2d5b40 (patch)
treeb827cc4bff0102504dbf53564267c58bb62b642d /fs/cifs/asn1.c
parentef571cadd516e7ffcdeac6bb8054e5908fcccfcf (diff)
downloadlinux-3.10-e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40.tar.gz
linux-3.10-e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40.tar.bz2
linux-3.10-e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40.zip
When verifying the decoded header before decoding the object identifier
(expecting a SPNEGO pseudo-mechanism oid), the test to verify it is a primitive encoding is compared against the asn1 class. Primitive is not a class. This brings check in line with similar check for krb/ntlmssp oid. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Cc: Steven French <sfrench@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/asn1.c')
-rw-r--r--fs/cifs/asn1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
index 42765465701..6bb440b257b 100644
--- a/fs/cifs/asn1.c
+++ b/fs/cifs/asn1.c
@@ -494,7 +494,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
/* remember to free obj->oid */
rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
if (rc) {
- if ((tag == ASN1_OJI) && (cls == ASN1_PRI)) {
+ if ((tag == ASN1_OJI) && (con == ASN1_PRI)) {
rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);
if (rc) {
rc = compare_oid(oid, oidlen,