Skip to content

Adjustments for OpenSSL download and cast #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
choas wants to merge 2 commits into
base: doge
Choose a base branch
from
Open

Adjustments for OpenSSL download and cast #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7582c33
adjust openssl script: change http to https, otherwise a 302 page (wi…
choas Jul 30, 2017
35b8bcc
fix compiler error: cast timestamp to BRPeer*
choas Jul 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BreadWallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
6 changes: 3 additions & 3 deletions BreadWallet/BRPeerManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}];
}
Expand Down Expand Up @@ -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];
}

Expand Down