From 7582c339281cec01bffa9558198e86e3a8c44c99 Mon Sep 17 00:00:00 2001 From: Lars Gregori Date: Sun, 30 Jul 2017 12:14:49 +0200 Subject: [PATCH 1/2] adjust openssl script: change http to https, otherwise a 302 page (with a redirect to the https file) returns instead of the openssl archive --- BreadWallet.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BreadWallet.xcodeproj/project.pbxproj b/BreadWallet.xcodeproj/project.pbxproj index d5998b034..ec308c2f2 100644 --- a/BreadWallet.xcodeproj/project.pbxproj +++ b/BreadWallet.xcodeproj/project.pbxproj @@ -3231,7 +3231,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "VERSION=1.0.1i\nARCHIVE=openssl-$VERSION.tar.gz\nSHA1=74eed314fa2c93006df8d26cd9fc630a101abd76\n\ncd $SRCROOT\nrm -rf $SRCROOT/openssl\nln -s openssl-$VERSION openssl\n\n([ -f $SRCROOT/$ARCHIVE ] && openssl sha1 $SRCROOT/$ARCHIVE | grep $SHA1) || \\\n(rm -rf $SRCROOT/openssl-* && curl -sSO http://www.openssl.org/source/$ARCHIVE && \\\nopenssl sha1 $SRCROOT/$ARCHIVE | grep $SHA1)\n\n[ -f $SRCROOT/openssl/ssl/tls_srp.c ] || tar -xvzf $ARCHIVE"; + shellScript = "VERSION=1.0.1i\nARCHIVE=openssl-$VERSION.tar.gz\nSHA1=74eed314fa2c93006df8d26cd9fc630a101abd76\n\ncd $SRCROOT\nrm -rf $SRCROOT/openssl\nln -s openssl-$VERSION openssl\n\n([ -f $SRCROOT/$ARCHIVE ] && openssl sha1 $SRCROOT/$ARCHIVE | grep $SHA1) || \\\n(rm -rf $SRCROOT/openssl-* && curl -sSO https://www.openssl.org/source/$ARCHIVE && \\\nopenssl sha1 $SRCROOT/$ARCHIVE | grep $SHA1)\n\n[ -f $SRCROOT/openssl/ssl/tls_srp.c ] || tar -xvzf $ARCHIVE"; }; /* End PBXShellScriptBuildPhase section */ From 35b8bccd19b126253ef378d5fcfda7d46879d9de Mon Sep 17 00:00:00 2001 From: Lars Gregori Date: Sun, 30 Jul 2017 12:17:49 +0200 Subject: [PATCH 2/2] fix compiler error: cast timestamp to BRPeer* --- BreadWallet/BRPeerManager.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BreadWallet/BRPeerManager.m b/BreadWallet/BRPeerManager.m index e9d983f30..f9b866535 100644 --- a/BreadWallet/BRPeerManager.m +++ b/BreadWallet/BRPeerManager.m @@ -906,8 +906,8 @@ - (void)peerMisbehavin:(BRPeer *)peer - (void)sortPeers { [_peers sortUsingComparator:^NSComparisonResult(id obj1, id obj2) { - if ([obj1 timestamp] > [obj2 timestamp]) return NSOrderedAscending; - if ([obj1 timestamp] < [obj2 timestamp]) return NSOrderedDescending; + if ([(BRPeer*) obj1 timestamp] > [(BRPeer*) obj2 timestamp]) return NSOrderedAscending; + if ([(BRPeer*) obj1 timestamp] < [(BRPeer*) obj2 timestamp]) return NSOrderedDescending; return NSOrderedSame; }]; } @@ -1097,7 +1097,7 @@ - (void)peer:(BRPeer *)peer relayedPeers:(NSArray *)peers NSTimeInterval t = [NSDate timeIntervalSinceReferenceDate] - 3*60*60; // remove peers more than 3 hours old, or until there are only 1000 left - while (self.peers.count > 1000 && [self.peers.lastObject timestamp] < t) { + while (self.peers.count > 1000 && [(BRPeer*)self.peers.lastObject timestamp] < t) { [self.peers removeObject:self.peers.lastObject]; }