Commit Graph

226 Commits

Author SHA1 Message Date
Felix Schulze 39bdb5e26e Merge pull request #99 from mconintet/patch-1
Fix file path
2016-08-08 21:40:55 +02:00
Felix Schulze f37f6b0781 Merge pull request #104 from martijnlaan/patch-1
Fix changelog date for OpenSSL 1.0.2h support.
2016-08-08 21:39:46 +02:00
Martijn Laan 264827083a Fix changelog date for OpenSSL 1.0.2h support. 2016-07-19 08:28:15 +02:00
mconintet 59a52a1678 Fix file path
File path is not right if use this project as submodule like case in this project https://github.com/x2on/libssh2-for-iOS
2016-05-19 12:17:22 +08:00
Felix Schulze a022b847b1 Merge pull request #98 from stehin/master
OpenSSL 1.0.2h
2016-05-06 16:15:16 +02:00
Stephen Hinton d96ec6da27 XCode -> Xcode 2016-05-04 12:18:06 -05:00
Stephen Hinton e50a25b5dd OpenSSL 1.0.2h 2016-05-04 12:11:59 -05:00
Felix Schulze ec684e0edf Merge pull request #95 from SteffenL/fix/get-openssl-from-github
Fixed broken download/extraction of old OpenSSL archives
2016-04-29 14:58:09 +02:00
Felix Schulze e39853b1d9 Merge pull request #93 from revolter/patch-1
Update README.md
2016-03-08 20:54:21 +01:00
Steffen André Langnes e154f51cd4 Fixed broken download/extraction of OpenSSL archives by getting them from GitHub.
The reason for this is that old archived versions of OpenSSL do not exist any more in the original location.
2016-03-08 18:51:06 +01:00
Felix Schulze c26602c9af Merge pull request #94 from zhzenghui/master
update openssl version
2016-03-02 08:51:10 +01:00
zhzenghui 38b30de71b update openssl version
1.0.2f is remove
2016-03-02 11:02:18 +08:00
Iulian Onofrei 94f26b6f57 Update README.md
Added hyperlink for issue 28
2016-02-15 17:20:46 +02:00
Felix Schulze d87bb5aaf2 Merge pull request #90 from x2on/openssl-1.0.2f
OpenSSL 1.0.2f
2016-01-31 21:23:30 +01:00
Felix Schulze 6f7e96be30 OpenSSL 1.0.2f
Fixes #88
Fixes #89
2016-01-31 19:21:05 +01:00
Felix Schulze 21264bf869 Merge pull request #83 from omochi/fix/isolate-source-per-build
[02] Fix/isolate source per build
2016-01-11 13:30:25 +01:00
omochimetaru 7c6d93ff18 isolate openssl source per build 2016-01-11 20:32:12 +09:00
Felix Schulze 2d4370f0f0 Merge pull request #82 from omochi/fix/code-appearance
[01] Fix/code appearance
2016-01-11 10:02:24 +01:00
omochimetaru e265fb2b91 wrap too long lines 2016-01-06 12:29:06 +09:00
omochimetaru 9f71eb4855 fix indent
replace all tabs to 2 spaces
apply same indent rule (e.g. case statement)
2016-01-06 12:08:17 +09:00
Felix Schulze c83ae1c7fb Merge pull request #80 from jasonlamkk/master
Update create-openssl-framework.sh
2015-12-28 10:26:50 +01:00
Jason Lam 4f9af36def Update create-openssl-framework.sh
enable code sign for resultant openssl.framework , which is required for latest xCode and iOS
2015-12-28 16:21:22 +08:00
Felix Schulze 208b2bf9cc Merge pull request #76 from x2on/show-progress
Add spinner for progress
2015-12-11 23:50:14 +01:00
Felix Schulze ce22295b4a Xcode 7.2, iOS 9.2 2015-12-11 23:49:52 +01:00
Felix Schulze ee4665d089 Merge pull request #78 from shuningzhou/RC4_INT-issue
Using the headers for x86_64 instead of i386
2015-12-10 21:53:55 +01:00
Peter Zhou fd7f063923 Using the headers for x86_64 instead of i386
RC4_INT is defined as unsigned char for i386, armv7, armv7s, arm64 which causes stack corruption for x86_64 platform.
2015-12-10 12:09:42 -08:00
Felix Schulze 86e3926087 More verbose 2015-12-08 18:24:38 +01:00
Felix Schulze ae252f2d30 Add spinner for progress 2015-12-07 18:51:50 +01:00
Felix Schulze a8aeebfac5 Add some output 2015-12-07 18:41:03 +01:00
Felix Schulze 4ae22c271e Merge pull request #73 from x2on/x2on-patch-1
OpenSSL 1.0.2e
2015-12-05 22:38:52 +01:00
Felix Schulze 94a10cc206 Update README.md 2015-12-03 20:13:31 +01:00
Felix Schulze 9d029f5daa OpenSSL 1.0.2e 2015-12-03 20:12:59 +01:00
Felix Schulze 7346a5f9da Update create-openssl-framework.sh
Add `ios_version_min` - but doesn't work at the moment (see http://www.openradar.me/22104678)
Related #72
2015-11-25 13:48:56 +01:00
Felix Schulze cd18638f51 Update .travis.yml
Add check for openssl-framework script on Travis. Related #72
2015-11-25 13:41:47 +01:00
Felix Schulze 550f280687 Merge pull request #70 from x2on/swift
Migrate example app to Swift
2015-11-17 16:39:49 +01:00
Felix Schulze 137490d161 Merge branch 'master' into swift 2015-11-17 14:44:13 +01:00
Felix Schulze 489ec00cf3 Merge pull request #69 from x2on/tvOS
Add tvOS example app
2015-11-17 14:43:52 +01:00
Felix Schulze c3c0c1893a Merge branch 'master' into swift 2015-11-17 14:42:57 +01:00
Felix Schulze 16625d8093 Migrate example app to Swift 2015-11-17 14:42:42 +01:00
Felix Schulze 2de304ec36 Add tvOS example app 2015-11-17 09:42:08 +01:00
Felix Schulze 95565b1135 Merge pull request #68 from x2on/tvOS
Add support for tvOS
2015-11-16 21:43:15 +01:00
Felix Schulze 24dc55b6a3 Fix variable 2015-11-16 19:47:23 +01:00
Felix Schulze a9ab81be88 Add support for tvOS 2015-11-16 19:33:54 +01:00
Felix Schulze 3d1cf2070e Xcode 7.1 settings 2015-10-26 22:23:58 +01:00
Felix Schulze 453bfd2769 Update README.md 2015-10-26 08:04:40 +01:00
Felix Schulze b218933bfd Update .travis.yml 2015-10-26 08:03:40 +01:00
Felix Schulze eae32bceae Update README.md 2015-10-26 08:03:09 +01:00
Felix Schulze 9bfe4d0518 Bitcode for Xcode 7.1
Fixes #65
2015-10-25 22:21:39 +01:00
Felix Schulze 5fb9d8a380 Merge pull request #64 from lifeisfoo/master
CURL options to support connection options
2015-09-18 15:44:08 +02:00
Alessandro Miliucci 64b87a6aa6 CURL options to support connection options
e.g. to work behind a corporate proxy:
CURL_OPTIONS="--proxy http://corpproxy.pro"
2015-09-18 15:16:52 +02:00