diff options
author | Chris Wright <chrisw@sous-sol.org> | 2008-07-24 16:43:34 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-07-24 16:43:34 -0400 |
commit | e2d2867ff8700d7431c68c089ff5f5ed7f2d5b40 (patch) | |
tree | b827cc4bff0102504dbf53564267c58bb62b642d | |
parent | ef571cadd516e7ffcdeac6bb8054e5908fcccfcf (diff) |
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>
-rw-r--r-- | fs/cifs/asn1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 42765465701c..6bb440b257b0 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c | |||
@@ -494,7 +494,7 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
494 | /* remember to free obj->oid */ | 494 | /* remember to free obj->oid */ |
495 | rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag); | 495 | rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag); |
496 | if (rc) { | 496 | if (rc) { |
497 | if ((tag == ASN1_OJI) && (cls == ASN1_PRI)) { | 497 | if ((tag == ASN1_OJI) && (con == ASN1_PRI)) { |
498 | rc = asn1_oid_decode(&ctx, end, &oid, &oidlen); | 498 | rc = asn1_oid_decode(&ctx, end, &oid, &oidlen); |
499 | if (rc) { | 499 | if (rc) { |
500 | rc = compare_oid(oid, oidlen, | 500 | rc = compare_oid(oid, oidlen, |