Skip to content

Commit

Permalink
Update libsodium and Xcode
Browse files Browse the repository at this point in the history
  • Loading branch information
jedisct1 committed May 1, 2021
1 parent ea3116e commit 62e2fec
Show file tree
Hide file tree
Showing 25 changed files with 32 additions and 32 deletions.
32 changes: 16 additions & 16 deletions Clibsodium.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,73 +8,75 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<string>ios-arm64_armv7_armv7s</string>
<key>LibraryPath</key>
<string>libsodium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>armv7</string>
<string>armv7s</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
<string>ios</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libsodium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>libsodium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>maccatalyst</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7_armv7s</string>
<string>tvos-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libsodium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>armv7s</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<string>tvos</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>tvos-arm64_x86_64-simulator</string>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>libsodium.a</string>
<key>SupportedArchitectures</key>
Expand All @@ -83,9 +85,7 @@
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>tvos</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>macos</string>
</dict>
<dict>
<key>HeadersPath</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file modified Clibsodium.xcframework/ios-arm64_armv7_armv7s/libsodium.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file modified Clibsodium.xcframework/ios-arm64_x86_64-maccatalyst/libsodium.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file modified Clibsodium.xcframework/macos-arm64_x86_64/libsodium.a
Binary file not shown.
2 changes: 1 addition & 1 deletion Clibsodium.xcframework/tvos-arm64/Headers/sodium/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file modified Clibsodium.xcframework/tvos-arm64/libsodium.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file modified Clibsodium.xcframework/tvos-arm64_x86_64-simulator/libsodium.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file modified Clibsodium.xcframework/watchos-arm64_32_armv7k/libsodium.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The `Clibsodium.xcframework` framework has been generated by the
[dist-build/apple-xcframework.sh](https://github.com/jedisct1/libsodium/blob/master/dist-build/apple-xcframework.sh)
script.

Running this script on Xcode 12.3 (`12C33`) on the revision `a08a945c589462f524efddbc8d62427bb002bb6a` of libsodium generates files identical to the ones present in this repository.
Running this script on Xcode 12.5 (`12E262`) on the revision `8aedf4733884a25434b5c17c79c7e7dee27e6eb0` of libsodium generates files identical to the ones present in this repository.

## Secret-key cryptography

Expand Down
2 changes: 1 addition & 1 deletion Sodium.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 1170;
LastUpgradeCheck = 1210;
LastUpgradeCheck = 1240;
ORGANIZATIONNAME = "Frank Denis";
TargetAttributes = {
09A943C61A4EB5F500C8A04F = {
Expand Down
2 changes: 1 addition & 1 deletion Sodium.xcodeproj/xcshareddata/xcschemes/Sodium.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Sodium/libsodium/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int sodium_munlock(void * const addr, const size_t len)
* either 357 or 361 bytes. For this reason, when using sodium_malloc() to
* allocate a crypto_generichash_state structure, padding must be added in
* order to ensure proper alignment. crypto_generichash_statebytes()
* returns the rounded up structure size, and should be prefered to sizeof():
* returns the rounded up structure size, and should be preferred to sizeof():
* state = sodium_malloc(crypto_generichash_statebytes());
*/

Expand Down

0 comments on commit 62e2fec

Please sign in to comment.