Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging Themis Carthage changes, and minor docs update to master #484

Merged
merged 2 commits into from
Jun 26, 2019
Merged

Merging Themis Carthage changes, and minor docs update to master #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f060fcb
fix documentation warnings inside themis/soter
vixentael Jun 4, 2019
7c4ac80
changes from openssl linkage
vixentael Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
github "krzyzanowskim/OpenSSL" ~> 1.0.2
# temporary use our fork due to errors in krzyzanowskim/OpenSSL 1.0.2.18
# https://github.com/krzyzanowskim/OpenSSL/issues/64
# https://github.com/krzyzanowskim/OpenSSL/issues/63
# hash of 1.0.2.17 tag
github "krzyzanowskim/OpenSSL" "990bd88"

# broken tag is 1.0.2.18
# github "krzyzanowskim/OpenSSL" ~> 1.0.2

2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "krzyzanowskim/OpenSSL" "1.0.2.17"
github "krzyzanowskim/OpenSSL" "990bd88219da80d7a77289aeae245b3eb400d834"
4 changes: 2 additions & 2 deletions docs/examples/objc/iOS-Carthage/Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "cossacklabs/themis" "0.11.0"
github "krzyzanowskim/OpenSSL" "1.0.2.17"
github "cossacklabs/themis" "0.11.2"
github "krzyzanowskim/OpenSSL" "990bd88219da80d7a77289aeae245b3eb400d834"
4 changes: 2 additions & 2 deletions docs/examples/objc/macOS-Carthage/Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "cossacklabs/themis" "0.11.0"
github "krzyzanowskim/OpenSSL" "1.0.2.17"
github "cossacklabs/themis" "0.11.2"
github "krzyzanowskim/OpenSSL" "990bd88219da80d7a77289aeae245b3eb400d834"
4 changes: 2 additions & 2 deletions docs/examples/swift/macOS-Carthage/Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "cossacklabs/themis" "0.11.0"
github "krzyzanowskim/OpenSSL" "1.0.2.17"
github "cossacklabs/themis" "0.11.2"
github "krzyzanowskim/OpenSSL" "990bd88219da80d7a77289aeae245b3eb400d834"
4 changes: 2 additions & 2 deletions src/soter/soter_sym.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,10 @@ soter_status_t soter_sym_aead_decrypt_aad(soter_sym_ctx_t* ctx, const void* plai
* @param [in] ctx pointer to symmetric decryption context prerviosly created by
* soter_sym_decrypt_create
* @param [in] cipher_data pointer to data buffer to decrypt
* @param [in] cipher_data_length length of cipher_data
* @param [in] data_length length of cipher_data
* @param [out] plain_data pointer to buffer to plain data store, may be set to NULL for plain data
* length determination
* @param [in, out] data_length length of plain_data
* @param [in, out] plain_data_length length of plain_data
* @return result of operation, @ref SOTER_SUCCESS on success and @ref SOTER_FAIL on failure.
* @note If plain_data==NULL or plain_data_length less then need to store plain data, @ref
* SOTER_BUFFER_TOO_SMALL will return and plain_data_length will contain length of buffer thet need
Expand Down
8 changes: 4 additions & 4 deletions src/themis/secure_cell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ themis_status_t themis_secure_cell_decrypt_seal(const uint8_t* master_key,
* @param [in] user_context_length length of user_context
* @param [in] message message to encrypt
* @param [in] message_length length of message
* @param [out] token additional authentication info. May be set to NULL for additional
* @param [out] context additional authentication info. May be set to NULL for additional
* authentication info length determination
* @param [in, out] token_length length of additional authentication info
* @param [in, out] context_length length of additional authentication info
* @param [out] encrypted_message buffer for encrypted message store. May be set to NULL for
* encrypted message length determination
* @param [in, out] encrypted_message_length length of encrypted_message
Expand Down Expand Up @@ -146,8 +146,8 @@ themis_status_t themis_secure_cell_encrypt_token_protect(const uint8_t* master_k
* @param [in] user_context_length length of user_context
* @param [in] encrypted_message message to decrypt
* @param [in] encrypted_message_length length of encrypted_message
* @param [in] token additional authentication info
* @param [in] token_length length of additional authentication info
* @param [in] context additional authentication info
* @param [in] context_length length of additional authentication info
* @param [out] plain_message buffer for plain message store. May be set to NULL for plain message
* length determination
* @param [in, out] plain_message_length length of plain_message
Expand Down