@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019
- *   Jonathan Schleifer <js@heap.zone>
+ * Copyright (c) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2021
+ *   Jonathan Schleifer <js@nil.im>
  * Copyright (c) 2011, 2012, Florian Zeitz <florob@babelmonkeys.de>
  *
  * https://heap.zone/objxmpp/
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -342,12 +342,12 @@
 	else {
 		OFString *SRVDomain = [_domainToASCII
 		    stringByPrependingString: @"_xmpp-client._tcp."];
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: SRVDomain
-			       DNSClass: OF_DNS_CLASS_IN
-			     recordType: OF_DNS_RECORD_TYPE_SRV];
+			       DNSClass: OFDNSClassIN
+			     recordType: OFDNSRecordTypeSRV];
 		[[OFThread DNSResolver] asyncPerformQuery: query
 						 delegate: self];
 	}
 
 	objc_autoreleasePoolPop(pool);
@@ -751,11 +751,11 @@
 		[_delegates broadcastSelector: @selector(
 						   connectionWillUpgradeToTLS:)
 				   withObject: self];
 
 		newSock = [[SSLSocket alloc] initWithSocket: _socket];
-		newSock.certificateVerificationEnabled = false;
+		newSock.verifiesCertificates = false;
 #if 0
 		/* FIXME: Not yet implemented by ObjOpenSSL */
 		[newSock setCertificateFile: _certificateFile];
 		[newSock setPrivateKeyFile: _privateKeyFile];
 		[newSock setPrivateKeyPassphrase: _privateKeyPassphrase];
@@ -1082,11 +1082,11 @@
 
 - (void)xmpp_handleSessionForConnection: (XMPPConnection *)connection
 				     IQ: (XMPPIQ *)IQ
 {
 	if (![IQ.type isEqual: @"result"])
-		OF_ENSURE(0);
+		OFEnsure(0);
 
 	[_delegates broadcastSelector: @selector(connection:wasBoundToJID:)
 			   withObject: self
 			   withObject: _JID];
 }