Skip to content

Commit

Permalink
Support for Xcode 5 and arm64 architecture [#36, #37]
Browse files Browse the repository at this point in the history
  • Loading branch information
Frugghi committed Sep 30, 2013
1 parent 2e43846 commit 4c5c7a0
Show file tree
Hide file tree
Showing 84 changed files with 7 additions and 245 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ xcuserdata
*.plist
NMSSH.framework
*.xcworkspacedata
*.xccheckout
14 changes: 5 additions & 9 deletions NMSSH-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
1849AE1117D6C2A200680D89 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18A0963017D6A85F008B76FB /* Foundation.framework */; };
18A0966717D6AA3D008B76FB /* NMSSHLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A0966417D6AA3D008B76FB /* NMSSHLogger.h */; };
18A0966817D6AA3D008B76FB /* socket_helper.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A0966517D6AA3D008B76FB /* socket_helper.h */; };
18A0966917D6AA3D008B76FB /* socket_helper.m in Sources */ = {isa = PBXBuildFile; fileRef = 18A0966617D6AA3D008B76FB /* socket_helper.m */; };
Expand Down Expand Up @@ -80,7 +79,6 @@
18A096FD17D6AA7B008B76FB /* obj_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096AB17D6AA7B008B76FB /* obj_mac.h */; };
18A096FE17D6AA7B008B76FB /* objects.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096AC17D6AA7B008B76FB /* objects.h */; };
18A096FF17D6AA7B008B76FB /* ocsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096AD17D6AA7B008B76FB /* ocsp.h */; };
18A0970017D6AA7B008B76FB /* opensslconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096AE17D6AA7B008B76FB /* opensslconf.h */; };
18A0970117D6AA7B008B76FB /* opensslv.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096AF17D6AA7B008B76FB /* opensslv.h */; };
18A0970217D6AA7B008B76FB /* ossl_typ.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096B017D6AA7B008B76FB /* ossl_typ.h */; };
18A0970317D6AA7B008B76FB /* pem.h in Headers */ = {isa = PBXBuildFile; fileRef = 18A096B117D6AA7B008B76FB /* pem.h */; };
Expand Down Expand Up @@ -116,7 +114,6 @@
18A0972117D6AA7B008B76FB /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18A096D017D6AA7B008B76FB /* libcrypto.a */; };
18A0972217D6AA7C008B76FB /* libssh2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18A096D117D6AA7B008B76FB /* libssh2.a */; };
18A0972317D6AA7C008B76FB /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18A096D217D6AA7B008B76FB /* libssl.a */; };
18A0972517D6AAA8008B76FB /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 18A0972417D6AAA8008B76FB /* libz.dylib */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -180,7 +177,6 @@
18A096AB17D6AA7B008B76FB /* obj_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = obj_mac.h; sourceTree = "<group>"; };
18A096AC17D6AA7B008B76FB /* objects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objects.h; sourceTree = "<group>"; };
18A096AD17D6AA7B008B76FB /* ocsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ocsp.h; sourceTree = "<group>"; };
18A096AE17D6AA7B008B76FB /* opensslconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opensslconf.h; sourceTree = "<group>"; };
18A096AF17D6AA7B008B76FB /* opensslv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opensslv.h; sourceTree = "<group>"; };
18A096B017D6AA7B008B76FB /* ossl_typ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ossl_typ.h; sourceTree = "<group>"; };
18A096B117D6AA7B008B76FB /* pem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pem.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -224,8 +220,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1849AE1117D6C2A200680D89 /* Foundation.framework in Frameworks */,
18A0972517D6AAA8008B76FB /* libz.dylib in Frameworks */,
18A0972117D6AA7B008B76FB /* libcrypto.a in Frameworks */,
18A0972217D6AA7C008B76FB /* libssh2.a in Frameworks */,
18A0972317D6AA7C008B76FB /* libssl.a in Frameworks */,
Expand Down Expand Up @@ -380,7 +374,6 @@
18A096AB17D6AA7B008B76FB /* obj_mac.h */,
18A096AC17D6AA7B008B76FB /* objects.h */,
18A096AD17D6AA7B008B76FB /* ocsp.h */,
18A096AE17D6AA7B008B76FB /* opensslconf.h */,
18A096AF17D6AA7B008B76FB /* opensslv.h */,
18A096B017D6AA7B008B76FB /* ossl_typ.h */,
18A096B117D6AA7B008B76FB /* pem.h */,
Expand Down Expand Up @@ -487,7 +480,6 @@
18A096FD17D6AA7B008B76FB /* obj_mac.h in Headers */,
18A096FE17D6AA7B008B76FB /* objects.h in Headers */,
18A096FF17D6AA7B008B76FB /* ocsp.h in Headers */,
18A0970017D6AA7B008B76FB /* opensslconf.h in Headers */,
18A0970117D6AA7B008B76FB /* opensslv.h in Headers */,
18A0970217D6AA7B008B76FB /* ossl_typ.h in Headers */,
18A0970317D6AA7B008B76FB /* pem.h in Headers */,
Expand Down Expand Up @@ -607,7 +599,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Sets the target folders and the final framework product.\nFMK_NAME=NMSSH # replace with your framework name\nFMK_VERSION=A # replace with your version\n\n# Install dir will be the final output to the framework.\n# The following line create it in the root folder of the current project.\nINSTALL_DIR=${SRCROOT}/Products/${FMK_NAME}.framework\n\n# Working dir will be deleted after the framework creation.\nWRK_DIR=build\nDEVICE_DIR=${WRK_DIR}/Release-iphoneos/${FMK_NAME}.framework\nSIMULATOR_DIR=${WRK_DIR}/Release-iphonesimulator/${FMK_NAME}.framework\n\n# Cleaning the oldest.\nif [ -d \"${INSTALL_DIR}\" ]\nthen\nrm -rf \"${INSTALL_DIR}\"\nfi\n\n# Creates and renews the final product folder.\nmkdir -p \"${INSTALL_DIR}\"\nmkdir -p \"${INSTALL_DIR}/Versions\"\nmkdir -p \"${INSTALL_DIR}/Versions/${FMK_VERSION}\"\nmkdir -p \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources\"\nmkdir -p \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Headers\"\n\n# Creates the internal links.\n# It MUST uses relative path, otherwise will not work when the folder is copied/moved.\nln -s \"${FMK_VERSION}\" \"${INSTALL_DIR}/Versions/Current\"\nln -s \"Versions/Current/Headers\" \"${INSTALL_DIR}/Headers\"\nln -s \"Versions/Current/Resources\" \"${INSTALL_DIR}/Resources\"\nln -s \"Versions/Current/${FMK_NAME}\" \"${INSTALL_DIR}/${FMK_NAME}\"\n\n# Copies the headers and resources files to the final product folder.\ncp -R \"${DEVICE_DIR}/Headers/\" \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Headers/\"\ncp -R \"${DEVICE_DIR}/\" \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources/\"\n\n# Removes the binary and header from the resources folder.\nrm -r \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources/Headers\" \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources/${FMK_NAME}\"\n\n# Uses the Lipo Tool to merge both binary files (i386 + armv6/armv7) into one Universal final product.\nlipo -create \"${DEVICE_DIR}/${FMK_NAME}\" \"${SIMULATOR_DIR}/${FMK_NAME}\" -output \"${INSTALL_DIR}/Versions/${FMK_VERSION}/${FMK_NAME}\"\nrm -r \"${WRK_DIR}\"";
shellScript = "# Sets the target folders and the final framework product.\nFMK_NAME=NMSSH # replace with your framework name\nFMK_VERSION=A # replace with your version\n\n# Install dir will be the final output to the framework.\n# The following line create it in the root folder of the current project.\nINSTALL_DIR=${SRCROOT}/Products/${FMK_NAME}.framework\n\n# Working dir will be deleted after the framework creation.\nWRK_DIR=build\nDEVICE_DIR=${WRK_DIR}/Release-iphoneos/${FMK_NAME}.framework\nSIMULATOR_DIR=${WRK_DIR}/Release-iphonesimulator/${FMK_NAME}.framework\n\n# Cleaning the oldest.\nif [ -d \"${INSTALL_DIR}\" ]\nthen\nrm -rf \"${INSTALL_DIR}\"\nfi\n\n# Creates and renews the final product folder.\nmkdir -p \"${INSTALL_DIR}\"\nmkdir -p \"${INSTALL_DIR}/Versions\"\nmkdir -p \"${INSTALL_DIR}/Versions/${FMK_VERSION}\"\nmkdir -p \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources\"\nmkdir -p \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Headers\"\n\n# Creates the internal links.\n# It MUST uses relative path, otherwise will not work when the folder is copied/moved.\nln -s \"${FMK_VERSION}\" \"${INSTALL_DIR}/Versions/Current\"\nln -s \"Versions/Current/Headers\" \"${INSTALL_DIR}/Headers\"\nln -s \"Versions/Current/Resources\" \"${INSTALL_DIR}/Resources\"\nln -s \"Versions/Current/${FMK_NAME}\" \"${INSTALL_DIR}/${FMK_NAME}\"\n\n# Copies the headers and resources files to the final product folder.\ncp -R \"${DEVICE_DIR}/Headers/\" \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Headers/\"\ncp -R \"${DEVICE_DIR}/\" \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources/\"\n\n# Removes the binary and header from the resources folder.\nrm -r \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources/Headers\" \"${INSTALL_DIR}/Versions/${FMK_VERSION}/Resources/${FMK_NAME}\"\n\n# Uses the Lipo Tool to merge both binary files into one Universal final product.\nlipo -create \"${DEVICE_DIR}/${FMK_NAME}\" \"${SIMULATOR_DIR}/${FMK_NAME}\" -output \"${INSTALL_DIR}/Versions/${FMK_VERSION}/${FMK_NAME}\"\nrm -r \"${WRK_DIR}\"";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -687,6 +679,7 @@
18A0965917D6A8C4008B76FB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
Expand All @@ -713,6 +706,7 @@
18A0965A17D6A8C4008B76FB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down Expand Up @@ -740,13 +734,15 @@
18A0965F17D6A97C008B76FB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
18A0966017D6A97C008B76FB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
Empty file modified NMSSH-iOS/Libraries/include/libssh2/libssh2.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/libssh2/libssh2_publickey.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/libssh2/libssh2_sftp.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/aes.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/asn1.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/asn1_mac.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/asn1t.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/bio.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/blowfish.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/bn.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/buffer.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/camellia.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/cast.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/cmac.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/cms.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/comp.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/conf.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/conf_api.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/crypto.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/des.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/des_old.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/dh.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/dsa.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/dso.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/dtls1.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/e_os2.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ebcdic.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ec.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ecdh.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ecdsa.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/engine.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/err.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/evp.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/hmac.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/idea.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/krb5_asn.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/kssl.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/lhash.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/md4.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/md5.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/mdc2.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/modes.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/obj_mac.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/objects.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ocsp.h
100644 → 100755
Empty file.
235 changes: 0 additions & 235 deletions NMSSH-iOS/Libraries/include/openssl/opensslconf.h

This file was deleted.

Empty file modified NMSSH-iOS/Libraries/include/openssl/opensslv.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ossl_typ.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/pem.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/pem2.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/pkcs12.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/pkcs7.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/pqueue.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/rand.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/rc2.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/rc4.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ripemd.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/rsa.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/safestack.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/seed.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/sha.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/srp.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/srtp.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ssl.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ssl2.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ssl23.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ssl3.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/stack.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/symhacks.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/tls1.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ts.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/txt_db.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ui.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/ui_compat.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/whrlpool.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/x509.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/x509_vfy.h
100644 → 100755
Empty file.
Empty file modified NMSSH-iOS/Libraries/include/openssl/x509v3.h
100644 → 100755
Empty file.
Binary file modified NMSSH-iOS/Libraries/lib/libcrypto.a
100644 → 100755
Binary file not shown.
Binary file modified NMSSH-iOS/Libraries/lib/libssh2.a
100644 → 100755
Binary file not shown.
Binary file modified NMSSH-iOS/Libraries/lib/libssl.a
100644 → 100755
Binary file not shown.
2 changes: 1 addition & 1 deletion NMSSH/NMSSHChannel.m
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ - (BOOL)downloadFile:(NSString *)remotePath to:(NSString *)localPath {
off_t got = 0;
while (got < fileinfo.st_size) {
char mem[self.bufferSize];
long long amount = sizeof(mem);
size_t amount = sizeof(mem);

if ((fileinfo.st_size - got) < amount) {
amount = fileinfo.st_size - got;
Expand Down

0 comments on commit 4c5c7a0

Please sign in to comment.