ObjXMPP  Check-in [8e3aaca400]

Overview
Comment:Use an OFSet for mechanisms.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8e3aaca40048ea26ad69cc9126866d8f7fcb77cc4f5a6e5a5ea9a4333f1d109f
User & Date: js on 2011-09-10 16:17:35
Other Links: manifest | tags
Context
2011-09-10
18:24
Remove obsolete comment check-in: 92e951e73f user: florob@babelmonkeys.de tags: trunk
16:17
Use an OFSet for mechanisms. check-in: 8e3aaca400 user: js tags: trunk
14:08
Add support for SCRAM-SHA-1-PLUS check-in: 7bcda1b5e6 user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/XMPPConnection.m from [6ede1f3c36] to [09cb9f4b6c].

︙︙
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712

					       namespace: XMPP_NS_STARTTLS];
	OFXMLElement *bind = [element elementForName: @"bind"
					   namespace: XMPP_NS_BIND];
	OFXMLElement *session = [element elementForName: @"session"
					      namespace: XMPP_NS_SESSION];
	OFXMLElement *mechs = [element elementForName: @"mechanisms"
					    namespace: XMPP_NS_SASL];
	OFMutableArray *mechanisms = [OFMutableArray array];

	if (starttls != nil) {
		[self sendStanza:
		    [OFXMLElement elementWithName: @"starttls"
					namespace: XMPP_NS_STARTTLS]];
		return;
	}








|








698
699
700
701
702
703
704
705
706
707
708
709
710
711
712

					       namespace: XMPP_NS_STARTTLS];
	OFXMLElement *bind = [element elementForName: @"bind"
					   namespace: XMPP_NS_BIND];
	OFXMLElement *session = [element elementForName: @"session"
					      namespace: XMPP_NS_SESSION];
	OFXMLElement *mechs = [element elementForName: @"mechanisms"
					    namespace: XMPP_NS_SASL];
	OFMutableSet *mechanisms = [OFMutableSet set];

	if (starttls != nil) {
		[self sendStanza:
		    [OFXMLElement elementWithName: @"starttls"
					namespace: XMPP_NS_STARTTLS]];
		return;
	}
︙︙

Modified src/XMPPSCRAMAuth.m from [87baaa29de] to [b20266da7a].

︙︙
147
148
149
150
151
152
153
154

155

156
157
158
159
160
161
162
163
164

{
	OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];

	[GS2Header release];
	GS2Header = nil;

	if (authzid)
		GS2Header = [[OFString alloc] initWithFormat: @"%@,a=%@,",

			(plusAvailable ? @"p=tls-unique" : @"y"), authzid];

	else
		GS2Header = plusAvailable ? @"p=tls-unique,," : @"y,,";

	[cNonce release];
	cNonce = nil;
	cNonce = [[self XMPP_genNonce] retain];

	[clientFirstMessageBare release];
	clientFirstMessageBare = nil;








|
>
|
>

|








147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166

{
	OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];

	[GS2Header release];
	GS2Header = nil;

	if (authzid)
		GS2Header = [[OFString alloc]
		    initWithFormat: @"%@,a=%@,",
				    (plusAvailable ? @"p=tls-unique" : @"y"),
				    authzid];
	else
		GS2Header = (plusAvailable ? @"p=tls-unique,," : @"y,,");

	[cNonce release];
	cNonce = nil;
	cNonce = [[self XMPP_genNonce] retain];

	[clientFirstMessageBare release];
	clientFirstMessageBare = nil;
︙︙