Overview
Comment: | Adjust to ObjFW changes |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
1ed4d99db8685724a741357f83415e6c |
User & Date: | js on 2017-01-21 23:49:14 |
Other Links: | manifest | tags |
Context
2017-01-21
| ||
23:51 | Update buildsys check-in: 23045f8fcd user: js tags: trunk | |
23:49 | Adjust to ObjFW changes check-in: 1ed4d99db8 user: js tags: trunk | |
2016-07-09
| ||
22:39 | Adjust to ObjFW changes check-in: 36e00ffb71 user: js tags: trunk | |
Changes
Modified src/XMPPDiscoEntity.m from [498b317e51] to [120532aacb].
︙ | ︙ | |||
83 84 85 86 87 88 89 | - (OFString*)capsHash { OFEnumerator *enumerator; XMPPDiscoIdentity *identity; OFString *feature; OFMutableString *caps = [OFMutableString string]; | | | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | - (OFString*)capsHash { OFEnumerator *enumerator; XMPPDiscoIdentity *identity; OFString *feature; OFMutableString *caps = [OFMutableString string]; OFSHA1Hash *hash = [OFSHA1Hash cryptoHash]; OFDataArray *digest = [OFDataArray dataArray]; enumerator = [_identities objectEnumerator]; while ((identity = [enumerator nextObject]) != nil) [caps appendFormat: @"%@/%@//%@<", [identity category], [identity type], [identity name]]; |
︙ | ︙ |
Modified src/XMPPPresence.m from [ef8e25196d] to [3189436599].
︙ | ︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #import "XMPPPresence.h" #import "namespaces.h" /* This provides us with sortable values for show values */ static int show_to_int(OFString *show) | > > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include <inttypes.h> #import "XMPPPresence.h" #import "namespaces.h" /* This provides us with sortable values for show values */ static int show_to_int(OFString *show) |
︙ | ︙ |
Modified src/XMPPSCRAMAuth.m from [cba6b07f8f] to [a8aa1d1b04].
︙ | ︙ | |||
197 198 199 200 201 202 203 | } - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data { size_t i; const uint8_t *clientKey, *serverKey, *clientSignature; intmax_t iterCount = 0; | | | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | } - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data { size_t i; const uint8_t *clientKey, *serverKey, *clientSignature; intmax_t iterCount = 0; id <OFCryptoHash> hash; OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword; OFString *tmpString, *sNonce = nil; OFEnumerator *enumerator; OFString *comp; enum { GOT_SNONCE = 0x01, GOT_SALT = 0x02, |
︙ | ︙ | |||
422 423 424 425 426 427 428 | - (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key data: (OFDataArray*)data { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDataArray *k = [OFDataArray dataArray]; size_t i, kSize, blockSize = [_hashType blockSize]; uint8_t *kI = NULL, *kO = NULL; | | | 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | - (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key data: (OFDataArray*)data { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDataArray *k = [OFDataArray dataArray]; size_t i, kSize, blockSize = [_hashType blockSize]; uint8_t *kI = NULL, *kO = NULL; id <OFCryptoHash> hashI, hashO; if ([key itemSize] * [key count] > blockSize) { hashI = [[[_hashType alloc] init] autorelease]; [hashI updateWithBuffer: [key items] length: [key itemSize] * [key count]]; [k addItems: [hashI digest] count: [_hashType digestSize]]; |
︙ | ︙ |
Modified src/XMPPSRVLookup.m from [6251193e54] to [5c2bd5b040].
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include <stdlib.h> #include <assert.h> #include <arpa/inet.h> #include <netdb.h> #include <sys/types.h> #include <openssl/rand.h> #import "XMPPSRVLookup.h" | > | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | * POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include <inttypes.h> #include <stdlib.h> #include <assert.h> #include <arpa/inet.h> #include <netdb.h> #include <sys/types.h> #include <openssl/rand.h> #import "XMPPSRVLookup.h" #import <ObjFW/OFLocalization.h> @implementation XMPPSRVEntry @synthesize priority = _priority, weight = _weight; @synthesize accumulatedWeight = _accumulatedWeight, port = _port; @synthesize target = _target; + (instancetype)entryWithPriority: (uint16_t)priority |
︙ | ︙ | |||
111 112 113 114 115 116 117 | if (dn_expand(ns_msg_base(handle), ns_msg_end(handle), (uint8_t*)&rdata[3], buffer, NS_MAXDNAME) < 1) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; _target = [[OFString alloc] initWithCString: buffer | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | if (dn_expand(ns_msg_base(handle), ns_msg_end(handle), (uint8_t*)&rdata[3], buffer, NS_MAXDNAME) < 1) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; _target = [[OFString alloc] initWithCString: buffer encoding: [OFLocalization encoding]]; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
188 189 190 191 192 193 194 | if (res_ninit(&_resState)) @throw [OFAddressTranslationFailedException exceptionWithHost: _domain]; answer = [self allocMemoryWithSize: pageSize]; answerLen = res_nsearch(&_resState, [request | | | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | if (res_ninit(&_resState)) @throw [OFAddressTranslationFailedException exceptionWithHost: _domain]; answer = [self allocMemoryWithSize: pageSize]; answerLen = res_nsearch(&_resState, [request cStringWithEncoding: [OFLocalization encoding]], ns_c_in, ns_t_srv, answer, (int)pageSize); if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) || (h_errno == NO_DATA))) return; if (answerLen < 1 || answerLen > pageSize) |
︙ | ︙ |
Modified src/XMPPStreamManagement.m from [febcd779c1] to [ac609a5929].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #import "XMPPStreamManagement.h" #import "namespaces.h" @implementation XMPPStreamManagement - initWithConnection: (XMPPConnection*)connection { | > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <inttypes.h> #import "XMPPStreamManagement.h" #import "namespaces.h" @implementation XMPPStreamManagement - initWithConnection: (XMPPConnection*)connection { |
︙ | ︙ |