From 2c02fae0ddf2d390537b9114183a2e184d688f3e Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 4 Jun 2020 14:38:50 +1000 Subject: [PATCH] Update podspec --- BuildTests/BuildTestsTests/SigningTests.m | 12 ++++++------ Classes/Curve25519.m | 6 +++--- Classes/Ed25519.m | 4 ++-- .../{Curve25519Kit.h => SessionCurve25519Kit.h} | 0 ...5519Kit.podspec => SessionCurve25519Kit.podspec | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) rename Classes/{Curve25519Kit.h => SessionCurve25519Kit.h} (100%) rename Curve25519Kit.podspec => SessionCurve25519Kit.podspec (72%) diff --git a/BuildTests/BuildTestsTests/SigningTests.m b/BuildTests/BuildTestsTests/SigningTests.m index 326cd15..d08b06e 100644 --- a/BuildTests/BuildTestsTests/SigningTests.m +++ b/BuildTests/BuildTestsTests/SigningTests.m @@ -4,7 +4,7 @@ #import "Curve25519.h" #import "Ed25519.h" -#import +#import #import @interface SigningTests : XCTestCase @@ -16,7 +16,7 @@ - (void)setUp { [super setUp]; - + } - (void)tearDown @@ -27,9 +27,9 @@ - (void)testingRandom{ for (int i = 1; i < 1000; i++) { for (int j = 0; j < 3; j++) { - + ECKeyPair *key = [Curve25519 generateKeyPair]; - + NSData *data = [Randomness generateRandomBytes:i]; NSData *signature = [Ed25519 throws_sign:data withKeyPair:key]; @@ -44,9 +44,9 @@ - (void)testingIdentityKeyStyle{ for (int i = 0; i < 10000; i++) { - + ECKeyPair *key = [Curve25519 generateKeyPair]; - + NSData *data = [Randomness generateRandomBytes:32]; NSData *signature = [Ed25519 throws_sign:data withKeyPair:key]; diff --git a/Classes/Curve25519.m b/Classes/Curve25519.m index 60747bc..fef3b4b 100644 --- a/Classes/Curve25519.m +++ b/Classes/Curve25519.m @@ -3,9 +3,9 @@ // #import "Curve25519.h" -#import -#import -#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Classes/Ed25519.m b/Classes/Ed25519.m index 617aa97..d846a3a 100644 --- a/Classes/Ed25519.m +++ b/Classes/Ed25519.m @@ -4,8 +4,8 @@ #import "Ed25519.h" #import "Curve25519.h" -#import -#import +#import +#import extern int curve25519_verify(const unsigned char *signature, /* 64 bytes */ const unsigned char *curve25519_pubkey, /* 32 bytes */ diff --git a/Classes/Curve25519Kit.h b/Classes/SessionCurve25519Kit.h similarity index 100% rename from Classes/Curve25519Kit.h rename to Classes/SessionCurve25519Kit.h diff --git a/Curve25519Kit.podspec b/SessionCurve25519Kit.podspec similarity index 72% rename from Curve25519Kit.podspec rename to SessionCurve25519Kit.podspec index 63a04a2..8f93518 100644 --- a/Curve25519Kit.podspec +++ b/SessionCurve25519Kit.podspec @@ -1,27 +1,27 @@ Pod::Spec.new do |spec| - spec.name = 'Curve25519Kit' - spec.version = '2.1.0' + spec.name = 'SessionCurve25519Kit' + spec.version = '2.1.1' spec.license = { :type => 'GPLv3' } - spec.homepage = 'https://github.com/WhisperSystems/Curve25519Kit' + spec.homepage = 'https://github.com/loki-project/session-ios-curve-25519-kit' spec.preserve_path = 'Sources/ed25519/**/*.{c,h}' - spec.authors = { 'Frederic Jacobs' => 'github@fredericjacobs.com' } + spec.authors = { 'Niels Andriesse' => 'niels@loki.network' } spec.summary = 'Key agreement (curve25519) and signing (ed25519), all with curve25519 keys.' spec.description = <<-DESC Curve25519 is a fast and secure curve used for key agreement. Unfortunately, it does not support signing out of the box. This pod translates the point curves to do ed25519 signing with curve25519 keys. DESC - spec.source = { :git => 'https://github.com/signalapp/Curve25519Kit.git', :tag => "#{spec.version}" } + spec.source = { :git => 'https://github.com/loki-project/session-ios-curve-25519-kit.git', :tag => "#{spec.version}" } spec.source_files = 'Classes/*.{h,m,swift}', 'Sources/Curve25519/curve25519-donna.c', 'Sources/ed25519/*.{c,h}', 'Sources/ed25519/additions/*.{c,h}', 'Sources/ed25519/nacl_sha512/*.{c,h}', 'Sources/ed25519/nacl_includes/*.{c,h}', 'Private/*.{h,m}' spec.public_header_files = 'Classes/**/*.h' #spec.private_header_files = 'Sources/ed25519/nacl_includes/*.h','Sources/ed25519/additions/*.h', 'Sources/ed25519/nacl_sha512/*.h' spec.framework = 'Security' spec.public_header_files = "Classes/*.h" spec.requires_arc = true - spec.ios.deployment_target = "9.0" + spec.ios.deployment_target = "10.0" spec.dependency 'CocoaLumberjack' - spec.dependency 'SignalCoreKit' + spec.dependency 'SessionCoreKit', '~> 1.0.0' spec.test_spec 'Tests' do |test_spec| test_spec.source_files = 'BuildTests/BuildTestsTests/**/*.{h,m,swift}'