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

Link libthemis_jni.so dynamically #552

Merged
merged 3 commits into from
Nov 8, 2019
Merged

Link libthemis_jni.so dynamically #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b29348a
Link libthemis_jni.so dynamically
ilammy Oct 30, 2019
1d131f2
Export private functions
ilammy Oct 30, 2019
ac871a3
Introduce THEMIS_PRIVATE_API
ilammy Nov 6, 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
4 changes: 2 additions & 2 deletions jni/themis_jni.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ endif

$(OBJ_PATH)/jni/%: CFLAGS += $(jvm_includes)

$(BIN_PATH)/$(LIBTHEMISJNI_SO): CMD = $(CC) -shared -o $@ $(filter %.o %.a, $^) $(LDFLAGS) $(CRYPTO_ENGINE_LDFLAGS)
$(BIN_PATH)/$(LIBTHEMISJNI_SO): CMD = $(CC) -shared -o $@ $(filter %.o %.a, $^) $(LDFLAGS) -lthemis

$(BIN_PATH)/$(LIBTHEMISJNI_SO): $(THEMIS_JNI_OBJ) $(THEMIS_STATIC)
$(BIN_PATH)/$(LIBTHEMISJNI_SO): $(THEMIS_JNI_OBJ) $(BIN_PATH)/$(LIBTHEMIS_SO)
@mkdir -p $(@D)
@echo -n "link "
@$(BUILD_CMD)
Expand Down
2 changes: 2 additions & 0 deletions src/themis/secure_session_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@ struct secure_session_type {
bool is_client;
};

THEMIS_PRIVATE_API
themis_status_t secure_session_init(secure_session_t* session_ctx,
const void* id,
size_t id_length,
const void* sign_key,
size_t sign_key_length,
const secure_session_user_callbacks_t* user_callbacks);
THEMIS_PRIVATE_API
themis_status_t secure_session_cleanup(secure_session_t* session_ctx);

#endif /* THEMIS_SECURE_SESSION_T_H */
6 changes: 6 additions & 0 deletions src/themis/themis_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,10 @@
#define THEMIS_API EMSCRIPTEN_KEEPALIVE
#endif

/*
* Marks API that needs to be exported for technical reasons, but otherwise
* is not intended for user consumption.
*/
#define THEMIS_PRIVATE_API THEMIS_API

#endif /* THEMIS_API_H */