include-iOS -> include

krzyzanowskim · jcavar · Jul 15, 2016 · Jul 15, 2016 · Jul 15, 2016 · Jul 15, 2016
commit ab971bb434260547780703ac0f5e54401e0b296b
diff --git a/OpenSSL-Universal.podspec b/OpenSSL-Universal.podspec
@@ -30,18 +30,18 @@ Pod::Spec.new do |s|
 
   s.subspec 'Static' do |ss|
     ss.ios.deployment_target = '6.0'
-    ss.ios.source_files        = 'OpenSSL-iOS/include-ios/openssl/**/*.h'
-    ss.ios.public_header_files = 'OpenSSL-iOS/include-ios/openssl/**/*.h'
+    ss.ios.source_files        = 'OpenSSL-iOS/include/openssl/**/*.h'
+    ss.ios.public_header_files = 'OpenSSL-iOS/include/openssl/**/*.h'
     ss.ios.header_dir          = 'openssl'
-    ss.ios.preserve_paths      = 'OpenSSL-iOS/lib-ios/libcrypto.a', 'OpenSSL-iOS/lib-ios/libssl.a'
-    ss.ios.vendored_libraries  = 'OpenSSL-iOS/lib-ios/libcrypto.a', 'OpenSSL-iOS/lib-ios/libssl.a'
+    ss.ios.preserve_paths      = 'OpenSSL-iOS/lib/libcrypto.a', 'OpenSSL-iOS/lib/libssl.a'
+    ss.ios.vendored_libraries  = 'OpenSSL-iOS/lib/libcrypto.a', 'OpenSSL-iOS/lib/libssl.a'
 
     ss.osx.deployment_target = '10.8'
-    ss.osx.source_files        = 'OpenSSL-macOS/include-macos/openssl/**/*.h'
-    ss.osx.public_header_files = 'OpenSSL-macOS/include-macos/openssl/**/*.h'
+    ss.osx.source_files        = 'OpenSSL-macOS/include/openssl/**/*.h'
+    ss.osx.public_header_files = 'OpenSSL-macOS/include/openssl/**/*.h'
     ss.osx.header_dir          = 'openssl'
-    ss.osx.preserve_paths      = 'OpenSSL-macOS/lib-macos/libcrypto.a', 'OpenSSL-macOS/lib-macos/libssl.a'
-    ss.osx.vendored_libraries  = 'OpenSSL-macOS/lib-macos/libcrypto.a', 'OpenSSL-macOS/lib-macos/libssl.a'
+    ss.osx.preserve_paths      = 'OpenSSL-macOS/lib/libcrypto.a', 'OpenSSL-macOS/lib/libssl.a'
+    ss.osx.vendored_libraries  = 'OpenSSL-macOS/lib/libcrypto.a', 'OpenSSL-macOS/lib/libssl.a'
 
     ss.libraries = 'ssl', 'crypto'
   end

diff --git a/OpenSSL-iOS/OpenSSL-iOS.xcodeproj/project.pbxproj b/OpenSSL-iOS/OpenSSL-iOS.xcodeproj/project.pbxproj
diff --git a/OpenSSL-iOS/bin/openssl.framework/openssl b/OpenSSL-iOS/bin/openssl.framework/openssl
diff --git a/OpenSSL-iOS/include-ios/openssl/opensslconf.h b/OpenSSL-iOS/include-ios/openssl/opensslconf.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/aes.h → OpenSSL-iOS/include/openssl/aes.h b/...L-iOS/bin/openssl.framework/Headers/aes.h → OpenSSL-iOS/include/openssl/aes.h
diff --git a/...-iOS/bin/openssl.framework/Headers/asn1.h → OpenSSL-iOS/include/openssl/asn1.h b/...-iOS/bin/openssl.framework/Headers/asn1.h → OpenSSL-iOS/include/openssl/asn1.h
diff --git a/.../bin/openssl.framework/Headers/asn1_mac.h → OpenSSL-iOS/include/openssl/asn1_mac.h b/.../bin/openssl.framework/Headers/asn1_mac.h → OpenSSL-iOS/include/openssl/asn1_mac.h
diff --git a/...iOS/bin/openssl.framework/Headers/asn1t.h → OpenSSL-iOS/include/openssl/asn1t.h b/...iOS/bin/openssl.framework/Headers/asn1t.h → OpenSSL-iOS/include/openssl/asn1t.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/bio.h → OpenSSL-iOS/include/openssl/bio.h b/...L-iOS/bin/openssl.framework/Headers/bio.h → OpenSSL-iOS/include/openssl/bio.h
diff --git a/.../bin/openssl.framework/Headers/blowfish.h → OpenSSL-iOS/include/openssl/blowfish.h b/.../bin/openssl.framework/Headers/blowfish.h → OpenSSL-iOS/include/openssl/blowfish.h
diff --git a/...SL-iOS/bin/openssl.framework/Headers/bn.h → OpenSSL-iOS/include/openssl/bn.h b/...SL-iOS/bin/openssl.framework/Headers/bn.h → OpenSSL-iOS/include/openssl/bn.h
diff --git a/...OS/bin/openssl.framework/Headers/buffer.h → OpenSSL-iOS/include/openssl/buffer.h b/...OS/bin/openssl.framework/Headers/buffer.h → OpenSSL-iOS/include/openssl/buffer.h
diff --git a/.../bin/openssl.framework/Headers/camellia.h → OpenSSL-iOS/include/openssl/camellia.h b/.../bin/openssl.framework/Headers/camellia.h → OpenSSL-iOS/include/openssl/camellia.h
diff --git a/...-iOS/bin/openssl.framework/Headers/cast.h → OpenSSL-iOS/include/openssl/cast.h b/...-iOS/bin/openssl.framework/Headers/cast.h → OpenSSL-iOS/include/openssl/cast.h
diff --git a/...-iOS/bin/openssl.framework/Headers/cmac.h → OpenSSL-iOS/include/openssl/cmac.h b/...-iOS/bin/openssl.framework/Headers/cmac.h → OpenSSL-iOS/include/openssl/cmac.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/cms.h → OpenSSL-iOS/include/openssl/cms.h b/...L-iOS/bin/openssl.framework/Headers/cms.h → OpenSSL-iOS/include/openssl/cms.h
diff --git a/...-iOS/bin/openssl.framework/Headers/comp.h → OpenSSL-iOS/include/openssl/comp.h b/...-iOS/bin/openssl.framework/Headers/comp.h → OpenSSL-iOS/include/openssl/comp.h
diff --git a/...-iOS/bin/openssl.framework/Headers/conf.h → OpenSSL-iOS/include/openssl/conf.h b/...-iOS/bin/openssl.framework/Headers/conf.h → OpenSSL-iOS/include/openssl/conf.h
diff --git a/.../bin/openssl.framework/Headers/conf_api.h → OpenSSL-iOS/include/openssl/conf_api.h b/.../bin/openssl.framework/Headers/conf_api.h → OpenSSL-iOS/include/openssl/conf_api.h
diff --git a/...OS/bin/openssl.framework/Headers/crypto.h → OpenSSL-iOS/include/openssl/crypto.h b/...OS/bin/openssl.framework/Headers/crypto.h → OpenSSL-iOS/include/openssl/crypto.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/des.h → OpenSSL-iOS/include/openssl/des.h b/...L-iOS/bin/openssl.framework/Headers/des.h → OpenSSL-iOS/include/openssl/des.h
diff --git a/...S/bin/openssl.framework/Headers/des_old.h → OpenSSL-iOS/include/openssl/des_old.h b/...S/bin/openssl.framework/Headers/des_old.h → OpenSSL-iOS/include/openssl/des_old.h
diff --git a/...SL-iOS/bin/openssl.framework/Headers/dh.h → OpenSSL-iOS/include/openssl/dh.h b/...SL-iOS/bin/openssl.framework/Headers/dh.h → OpenSSL-iOS/include/openssl/dh.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/dsa.h → OpenSSL-iOS/include/openssl/dsa.h b/...L-iOS/bin/openssl.framework/Headers/dsa.h → OpenSSL-iOS/include/openssl/dsa.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/dso.h → OpenSSL-iOS/include/openssl/dso.h b/...L-iOS/bin/openssl.framework/Headers/dso.h → OpenSSL-iOS/include/openssl/dso.h
diff --git a/...iOS/bin/openssl.framework/Headers/dtls1.h → OpenSSL-iOS/include/openssl/dtls1.h b/...iOS/bin/openssl.framework/Headers/dtls1.h → OpenSSL-iOS/include/openssl/dtls1.h
diff --git a/...iOS/bin/openssl.framework/Headers/e_os2.h → OpenSSL-iOS/include/openssl/e_os2.h b/...iOS/bin/openssl.framework/Headers/e_os2.h → OpenSSL-iOS/include/openssl/e_os2.h
diff --git a/...OS/bin/openssl.framework/Headers/ebcdic.h → OpenSSL-iOS/include/openssl/ebcdic.h b/...OS/bin/openssl.framework/Headers/ebcdic.h → OpenSSL-iOS/include/openssl/ebcdic.h
diff --git a/...SL-iOS/bin/openssl.framework/Headers/ec.h → OpenSSL-iOS/include/openssl/ec.h b/...SL-iOS/bin/openssl.framework/Headers/ec.h → OpenSSL-iOS/include/openssl/ec.h
diff --git a/...-iOS/bin/openssl.framework/Headers/ecdh.h → OpenSSL-iOS/include/openssl/ecdh.h b/...-iOS/bin/openssl.framework/Headers/ecdh.h → OpenSSL-iOS/include/openssl/ecdh.h
diff --git a/...iOS/bin/openssl.framework/Headers/ecdsa.h → OpenSSL-iOS/include/openssl/ecdsa.h b/...iOS/bin/openssl.framework/Headers/ecdsa.h → OpenSSL-iOS/include/openssl/ecdsa.h
diff --git a/...OS/bin/openssl.framework/Headers/engine.h → OpenSSL-iOS/include/openssl/engine.h b/...OS/bin/openssl.framework/Headers/engine.h → OpenSSL-iOS/include/openssl/engine.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/err.h → OpenSSL-iOS/include/openssl/err.h b/...L-iOS/bin/openssl.framework/Headers/err.h → OpenSSL-iOS/include/openssl/err.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/evp.h → OpenSSL-iOS/include/openssl/evp.h b/...L-iOS/bin/openssl.framework/Headers/evp.h → OpenSSL-iOS/include/openssl/evp.h
diff --git a/...-iOS/bin/openssl.framework/Headers/hmac.h → OpenSSL-iOS/include/openssl/hmac.h b/...-iOS/bin/openssl.framework/Headers/hmac.h → OpenSSL-iOS/include/openssl/hmac.h
diff --git a/...-iOS/bin/openssl.framework/Headers/idea.h → OpenSSL-iOS/include/openssl/idea.h b/...-iOS/bin/openssl.framework/Headers/idea.h → OpenSSL-iOS/include/openssl/idea.h
diff --git a/.../bin/openssl.framework/Headers/krb5_asn.h → OpenSSL-iOS/include/openssl/krb5_asn.h b/.../bin/openssl.framework/Headers/krb5_asn.h → OpenSSL-iOS/include/openssl/krb5_asn.h
diff --git a/...-iOS/bin/openssl.framework/Headers/kssl.h → OpenSSL-iOS/include/openssl/kssl.h b/...-iOS/bin/openssl.framework/Headers/kssl.h → OpenSSL-iOS/include/openssl/kssl.h
diff --git a/...iOS/bin/openssl.framework/Headers/lhash.h → OpenSSL-iOS/include/openssl/lhash.h b/...iOS/bin/openssl.framework/Headers/lhash.h → OpenSSL-iOS/include/openssl/lhash.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/md4.h → OpenSSL-iOS/include/openssl/md4.h b/...L-iOS/bin/openssl.framework/Headers/md4.h → OpenSSL-iOS/include/openssl/md4.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/md5.h → OpenSSL-iOS/include/openssl/md5.h b/...L-iOS/bin/openssl.framework/Headers/md5.h → OpenSSL-iOS/include/openssl/md5.h
diff --git a/...-iOS/bin/openssl.framework/Headers/mdc2.h → OpenSSL-iOS/include/openssl/mdc2.h b/...-iOS/bin/openssl.framework/Headers/mdc2.h → OpenSSL-iOS/include/openssl/mdc2.h
diff --git a/...iOS/bin/openssl.framework/Headers/modes.h → OpenSSL-iOS/include/openssl/modes.h b/...iOS/bin/openssl.framework/Headers/modes.h → OpenSSL-iOS/include/openssl/modes.h
diff --git a/...S/bin/openssl.framework/Headers/obj_mac.h → OpenSSL-iOS/include/openssl/obj_mac.h b/...S/bin/openssl.framework/Headers/obj_mac.h → OpenSSL-iOS/include/openssl/obj_mac.h
diff --git a/...S/bin/openssl.framework/Headers/objects.h → OpenSSL-iOS/include/openssl/objects.h b/...S/bin/openssl.framework/Headers/objects.h → OpenSSL-iOS/include/openssl/objects.h
diff --git a/...-iOS/bin/openssl.framework/Headers/ocsp.h → OpenSSL-iOS/include/openssl/ocsp.h b/...-iOS/bin/openssl.framework/Headers/ocsp.h → OpenSSL-iOS/include/openssl/ocsp.h
diff --git a/...n/openssl.framework/Headers/opensslconf.h → OpenSSL-iOS/include/openssl/opensslconf.h b/...n/openssl.framework/Headers/opensslconf.h → OpenSSL-iOS/include/openssl/opensslconf.h
diff --git a/.../bin/openssl.framework/Headers/opensslv.h → OpenSSL-iOS/include/openssl/opensslv.h b/.../bin/openssl.framework/Headers/opensslv.h → OpenSSL-iOS/include/openssl/opensslv.h
diff --git a/.../bin/openssl.framework/Headers/ossl_typ.h → OpenSSL-iOS/include/openssl/ossl_typ.h b/.../bin/openssl.framework/Headers/ossl_typ.h → OpenSSL-iOS/include/openssl/ossl_typ.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/pem.h → OpenSSL-iOS/include/openssl/pem.h b/...L-iOS/bin/openssl.framework/Headers/pem.h → OpenSSL-iOS/include/openssl/pem.h
diff --git a/...-iOS/bin/openssl.framework/Headers/pem2.h → OpenSSL-iOS/include/openssl/pem2.h b/...-iOS/bin/openssl.framework/Headers/pem2.h → OpenSSL-iOS/include/openssl/pem2.h
diff --git a/...OS/bin/openssl.framework/Headers/pkcs12.h → OpenSSL-iOS/include/openssl/pkcs12.h b/...OS/bin/openssl.framework/Headers/pkcs12.h → OpenSSL-iOS/include/openssl/pkcs12.h
diff --git a/...iOS/bin/openssl.framework/Headers/pkcs7.h → OpenSSL-iOS/include/openssl/pkcs7.h b/...iOS/bin/openssl.framework/Headers/pkcs7.h → OpenSSL-iOS/include/openssl/pkcs7.h
diff --git a/...OS/bin/openssl.framework/Headers/pqueue.h → OpenSSL-iOS/include/openssl/pqueue.h b/...OS/bin/openssl.framework/Headers/pqueue.h → OpenSSL-iOS/include/openssl/pqueue.h
diff --git a/...-iOS/bin/openssl.framework/Headers/rand.h → OpenSSL-iOS/include/openssl/rand.h b/...-iOS/bin/openssl.framework/Headers/rand.h → OpenSSL-iOS/include/openssl/rand.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/rc2.h → OpenSSL-iOS/include/openssl/rc2.h b/...L-iOS/bin/openssl.framework/Headers/rc2.h → OpenSSL-iOS/include/openssl/rc2.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/rc4.h → OpenSSL-iOS/include/openssl/rc4.h b/...L-iOS/bin/openssl.framework/Headers/rc4.h → OpenSSL-iOS/include/openssl/rc4.h
diff --git a/...OS/bin/openssl.framework/Headers/ripemd.h → OpenSSL-iOS/include/openssl/ripemd.h b/...OS/bin/openssl.framework/Headers/ripemd.h → OpenSSL-iOS/include/openssl/ripemd.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/rsa.h → OpenSSL-iOS/include/openssl/rsa.h b/...L-iOS/bin/openssl.framework/Headers/rsa.h → OpenSSL-iOS/include/openssl/rsa.h
diff --git a/...bin/openssl.framework/Headers/safestack.h → OpenSSL-iOS/include/openssl/safestack.h b/...bin/openssl.framework/Headers/safestack.h → OpenSSL-iOS/include/openssl/safestack.h
diff --git a/...-iOS/bin/openssl.framework/Headers/seed.h → OpenSSL-iOS/include/openssl/seed.h b/...-iOS/bin/openssl.framework/Headers/seed.h → OpenSSL-iOS/include/openssl/seed.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/sha.h → OpenSSL-iOS/include/openssl/sha.h b/...L-iOS/bin/openssl.framework/Headers/sha.h → OpenSSL-iOS/include/openssl/sha.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/srp.h → OpenSSL-iOS/include/openssl/srp.h b/...L-iOS/bin/openssl.framework/Headers/srp.h → OpenSSL-iOS/include/openssl/srp.h
diff --git a/...-iOS/bin/openssl.framework/Headers/srtp.h → OpenSSL-iOS/include/openssl/srtp.h b/...-iOS/bin/openssl.framework/Headers/srtp.h → OpenSSL-iOS/include/openssl/srtp.h
diff --git a/...L-iOS/bin/openssl.framework/Headers/ssl.h → OpenSSL-iOS/include/openssl/ssl.h b/...L-iOS/bin/openssl.framework/Headers/ssl.h → OpenSSL-iOS/include/openssl/ssl.h
diff --git a/...-iOS/bin/openssl.framework/Headers/ssl2.h → OpenSSL-iOS/include/openssl/ssl2.h b/...-iOS/bin/openssl.framework/Headers/ssl2.h → OpenSSL-iOS/include/openssl/ssl2.h
diff --git a/...iOS/bin/openssl.framework/Headers/ssl23.h → OpenSSL-iOS/include/openssl/ssl23.h b/...iOS/bin/openssl.framework/Headers/ssl23.h → OpenSSL-iOS/include/openssl/ssl23.h
diff --git a/...-iOS/bin/openssl.framework/Headers/ssl3.h → OpenSSL-iOS/include/openssl/ssl3.h b/...-iOS/bin/openssl.framework/Headers/ssl3.h → OpenSSL-iOS/include/openssl/ssl3.h
diff --git a/...iOS/bin/openssl.framework/Headers/stack.h → OpenSSL-iOS/include/openssl/stack.h b/...iOS/bin/openssl.framework/Headers/stack.h → OpenSSL-iOS/include/openssl/stack.h
diff --git a/.../bin/openssl.framework/Headers/symhacks.h → OpenSSL-iOS/include/openssl/symhacks.h b/.../bin/openssl.framework/Headers/symhacks.h → OpenSSL-iOS/include/openssl/symhacks.h
diff --git a/...-iOS/bin/openssl.framework/Headers/tls1.h → OpenSSL-iOS/include/openssl/tls1.h b/...-iOS/bin/openssl.framework/Headers/tls1.h → OpenSSL-iOS/include/openssl/tls1.h
diff --git a/...SL-iOS/bin/openssl.framework/Headers/ts.h → OpenSSL-iOS/include/openssl/ts.h b/...SL-iOS/bin/openssl.framework/Headers/ts.h → OpenSSL-iOS/include/openssl/ts.h
diff --git a/...OS/bin/openssl.framework/Headers/txt_db.h → OpenSSL-iOS/include/openssl/txt_db.h b/...OS/bin/openssl.framework/Headers/txt_db.h → OpenSSL-iOS/include/openssl/txt_db.h
diff --git a/...SL-iOS/bin/openssl.framework/Headers/ui.h → OpenSSL-iOS/include/openssl/ui.h b/...SL-iOS/bin/openssl.framework/Headers/ui.h → OpenSSL-iOS/include/openssl/ui.h
diff --git a/...bin/openssl.framework/Headers/ui_compat.h → OpenSSL-iOS/include/openssl/ui_compat.h b/...bin/openssl.framework/Headers/ui_compat.h → OpenSSL-iOS/include/openssl/ui_compat.h
diff --git a/.../bin/openssl.framework/Headers/whrlpool.h → OpenSSL-iOS/include/openssl/whrlpool.h b/.../bin/openssl.framework/Headers/whrlpool.h → OpenSSL-iOS/include/openssl/whrlpool.h
diff --git a/...-iOS/bin/openssl.framework/Headers/x509.h → OpenSSL-iOS/include/openssl/x509.h b/...-iOS/bin/openssl.framework/Headers/x509.h → OpenSSL-iOS/include/openssl/x509.h
diff --git a/.../bin/openssl.framework/Headers/x509_vfy.h → OpenSSL-iOS/include/openssl/x509_vfy.h b/.../bin/openssl.framework/Headers/x509_vfy.h → OpenSSL-iOS/include/openssl/x509_vfy.h
diff --git a/...OS/bin/openssl.framework/Headers/x509v3.h → OpenSSL-iOS/include/openssl/x509v3.h b/...OS/bin/openssl.framework/Headers/x509v3.h → OpenSSL-iOS/include/openssl/x509v3.h
diff --git a/OpenSSL-iOS/lib-ios/libcrypto.a → OpenSSL-iOS/lib/libcrypto.a b/OpenSSL-iOS/lib-ios/libcrypto.a → OpenSSL-iOS/lib/libcrypto.a
diff --git a/OpenSSL-iOS/lib-ios/libssl.a → OpenSSL-iOS/lib/libssl.a b/OpenSSL-iOS/lib-ios/libssl.a → OpenSSL-iOS/lib/libssl.a