浏览代码

Update OpenSSL dependency where Swift issue is workarounded

Marcin Krzyżanowski 11 年之前
父节点
当前提交
108df19c5b

+ 1 - 1
CryptoSwift-Bridging-Header.h

@@ -22,6 +22,6 @@
 #import <openssl/bn.h>
 #import <openssl/ossl_typ.h>
 
-//#import <openssl/rsa.h>
+#import <openssl/rsa.h>
 
 

+ 2 - 1
CryptoSwift/RSA.swift

@@ -24,6 +24,7 @@ class SwiftRSA {
     }
     
     func privateEncrypt(data: NSData) {
-//        var rsa:UnsafePointer<RSA> = RSA_new();
+        //TODO
+        //var rsa:UnsafePointer<RSA> = RSA_new();
     }
 }

+ 1 - 1
Podfile

@@ -1,3 +1,3 @@
 platform :ios, '7.0'
 link_with 'CryptoSwift', 'CryptoSwiftTests'
-pod 'OpenSSL-Universal'
+pod 'OpenSSL-Universal', git: "https://github.com/krzyzanowskim/OpenSSL.git", branch: :master

+ 7 - 2
Podfile.lock

@@ -2,9 +2,14 @@ PODS:
   - OpenSSL-Universal (1.0.1.h)
 
 DEPENDENCIES:
-  - OpenSSL-Universal
+  - OpenSSL-Universal (from `https://github.com/krzyzanowskim/OpenSSL.git`, branch `master`)
+
+EXTERNAL SOURCES:
+  OpenSSL-Universal:
+    :branch: :master
+    :git: https://github.com/krzyzanowskim/OpenSSL.git
 
 SPEC CHECKSUMS:
-  OpenSSL-Universal: 9c112508615ed33bb35f730eed820e93175a9dec
+  OpenSSL-Universal: 2876ed235f0ba33e1dce56d790f50f3074fb8919
 
 COCOAPODS: 0.33.1

+ 44 - 0
Pods/Local Podspecs/OpenSSL-Universal.podspec

@@ -0,0 +1,44 @@
+Pod::Spec.new do |s|
+  s.name         = "OpenSSL-Universal"
+  s.version      = "1.0.1.h"
+  s.summary      = "OpenSSL for iOS and OS X"
+  s.description  = "OpenSSL is an SSL/TLS and Crypto toolkit. Deprecated in Mac OS and gone in iOS, this spec gives your project non-deprecated OpenSSL support. Supports OSX and iOS including Simulator (armv7,armv7s,arm64,i386,x86_64)."
+  s.homepage     = "http://www.openssl.org/"
+  s.license	     = { :type => 'OpenSSL (OpenSSL/SSLeay)', :file => 'LICENSE.txt' }
+  s.source       = { :git => "https://github.com/krzak/OpenSSL.git", :tag => "#{s.version}" }
+
+  s.authors       =  {'Mark J. Cox' => 'mark@openssl.org',
+                     'Ralf S. Engelschall' => 'rse@openssl.org',
+                     'Dr. Stephen Henson' => 'steve@openssl.org',
+                     'Ben Laurie' => 'ben@openssl.org',
+                     'Lutz Jänicke' => 'jaenicke@openssl.org',
+                     'Nils Larsch' => 'nils@openssl.org',
+                     'Richard Levitte' => 'nils@openssl.org',
+                     'Bodo Möller' => 'bodo@openssl.org',
+                     'Ulf Möller' => 'ulf@openssl.org',
+                     'Andy Polyakov' => 'appro@openssl.org',
+                     'Geoff Thorpe' => 'geoff@openssl.org',
+                     'Holger Reif' => 'holger@openssl.org',
+                     'Paul C. Sutton' => 'geoff@openssl.org',
+                     'Eric A. Young' => 'eay@cryptsoft.com',
+                     'Tim Hudson' => 'tjh@cryptsoft.com',
+                     'Justin Plouffe' => 'plouffe.justin@gmail.com'}
+  
+  s.ios.platform          = :ios, '5.1.1'
+  s.ios.deployment_target = '5.1.1'
+  s.ios.source_files        = 'include-ios/openssl/**/*.h'
+  s.ios.public_header_files = 'include-ios/openssl/**/*.h'
+  s.ios.header_dir          = 'openssl'
+  s.ios.preserve_paths      = 'lib-ios/libcrypto.a', 'lib-ios/libssl.a'
+  s.ios.vendored_libraries  = 'lib-ios/libcrypto.a', 'lib-ios/libssl.a'
+
+  s.osx.platform          = :osx, '10.9'
+  s.osx.deployment_target = '10.7'
+  s.osx.source_files        = 'include-osx/openssl/**/*.h'
+  s.osx.public_header_files = 'include-osx/openssl/**/*.h'
+  s.osx.header_dir          = 'openssl'
+  s.osx.preserve_paths      = 'lib-osx/libcrypto.a', 'lib-osx/libssl.a'
+  s.osx.vendored_libraries  = 'lib-osx/libcrypto.a', 'lib-osx/libssl.a'
+
+  s.libraries = 'ssl', 'crypto'
+end

+ 7 - 2
Pods/Manifest.lock

@@ -2,9 +2,14 @@ PODS:
   - OpenSSL-Universal (1.0.1.h)
 
 DEPENDENCIES:
-  - OpenSSL-Universal
+  - OpenSSL-Universal (from `https://github.com/krzyzanowskim/OpenSSL.git`, branch `master`)
+
+EXTERNAL SOURCES:
+  OpenSSL-Universal:
+    :branch: :master
+    :git: https://github.com/krzyzanowskim/OpenSSL.git
 
 SPEC CHECKSUMS:
-  OpenSSL-Universal: 9c112508615ed33bb35f730eed820e93175a9dec
+  OpenSSL-Universal: 2876ed235f0ba33e1dce56d790f50f3074fb8919
 
 COCOAPODS: 0.33.1

+ 1 - 1
Pods/OpenSSL-Universal/include-ios/openssl/rsa.h

@@ -97,7 +97,7 @@ struct rsa_meth_st
 	int (*rsa_priv_dec)(int flen,const unsigned char *from,
 			    unsigned char *to,
 			    RSA *rsa,int padding);
-	int (*rsa_mod_exp)(BIGNUM *r0,const BIGNUM *I,RSA *rsa,BN_CTX *ctx); /* Can be null */
+	int (*rsa_mod_exp)(BIGNUM *r0,const BIGNUM *i,RSA *rsa,BN_CTX *ctx); /* Can be null */
 	int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 			  const BIGNUM *m, BN_CTX *ctx,
 			  BN_MONT_CTX *m_ctx); /* Can be null */

二进制
Pods/OpenSSL-Universal/lib-ios/libcrypto.a


二进制
Pods/OpenSSL-Universal/lib-ios/libssl.a


文件差异内容过多而无法显示
+ 487 - 398
Pods/Pods.xcodeproj/project.pbxproj


部分文件因为文件数量过多而无法显示