Просмотр исходного кода

Update READMEs regarding utls and OpenSSL

Rod Hynes 7 лет назад
Родитель
Сommit
8f0711dea0
2 измененных файлов с 3 добавлено и 30 удалено
  1. 2 4
      MobileLibrary/Android/README.md
  2. 1 26
      README.md

+ 2 - 4
MobileLibrary/Android/README.md

@@ -26,7 +26,7 @@ cd ../.. && \
   --rm \
   -v $(pwd):/go/src/github.com/Psiphon-Labs/psiphon-tunnel-core \
   psiandroid \
-  /bin/bash -c 'source /tmp/setenv-android.sh && cd /go/src/github.com/Psiphon-Labs/psiphon-tunnel-core/MobileLibrary/Android && ./make.bash' \
+  /bin/bash -c 'cd /go/src/github.com/Psiphon-Labs/psiphon-tunnel-core/MobileLibrary/Android && ./make.bash' \
 ; cd -
 ```
 
@@ -37,12 +37,10 @@ When that command completes, the compiled `.aar` files (suitable for use in an A
 ##### Prerequisites:
 
  - The `build-essential` package (on Debian based systems - or its equivalent for your platform)
- - Go 1.5 or later
+ - Go 1.9 or later
  - Full JDK
  - Android NDK
  - Android SDK
- - OpenSSL (tested against the version [here](../../openssl))
-  - Follow its [README](../../openssl/README.md) to prepare the environment before you follow the steps below
 
 ##### Steps:
 

+ 1 - 26
README.md

@@ -42,32 +42,6 @@ Client Setup
     "
     ```
 
-#### Platform-specific instructions
-
-##### macOS
-
-Building without OpenSSL support (that is, without indistinguishable TLS support) requires no extra steps. 
-To compile with OpenSSL support, follow these steps:
-
-1. You must have [Homebrew](http://brew.sh/) installed.
-
-2. `brew install openssl pkg-config`
-
-3. Find out where Homebrew put the `pkgconfig` files for OpenSSL -- the location depends on your Homebrew installation. Run this command:
-
-   ```
-   $ brew info openssl
-   ```
-   
-   Make note of the "build variable" path for `PKG_CONFIG_PATH`.
-   
-4. Set `PKG_CONFIG_PATH=<path discovered above>` when building, and provide the `-tags OPENSSL` flag. 
-   This can be easily done on the build command line like so:
-
-   ```
-   $ PKG_CONFIG_PATH=<path discovered above> go build -tags OPENSSL
-   ```
-
 ### Configure
 
  * Configuration files are standard text files containing a valid JSON object. Example:
@@ -124,6 +98,7 @@ Psiphon Tunnel Core uses:
 * [juju/ratelimit](https://github.com/juju/ratelimit)
 * [codahale/sss](https://github.com/codahale/sss)
 * [marusama/semaphore](https://github.com/marusama/semaphore)
+* [utls](https://github.com/refraction-networking/utls)
 
 Licensing
 --------------------------------------------------------------------------------