Skip to content

rsa: add compatibility for nettle 4.x #22

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

Open
rennr wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −0
Open

rsa: add compatibility for nettle 4.x #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ pkg_check_modules(SPICE_PKGCONFIG REQUIRED
hogweed
)

if (SPICE_PKGCONFIG_nettle_VERSION)
if (SPICE_PKGCONFIG_nettle_VERSION VERSION_GREATER_EQUAL "4.0")
message(STATUS "Using nettle >= 4.0 compatibility")
add_compile_definitions(USE_NETTLE_GE_4)
endif()
endif()

add_definitions(-D USE_NETTLE)

add_compile_options(
Expand Down
5 changes: 5 additions & 0 deletions src/rsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ static void sha1(uint8_t * hash, const uint8_t *data, unsigned int len)

sha1_init(&ctx);
sha1_update(&ctx, len, data);

#if defined(USE_NETTLE_GE_4)
sha1_digest(&ctx, hash);
#else
sha1_digest(&ctx, SHA1_HASH_LEN, hash);
#endif
}

static void oaep_mask(uint8_t * dest, size_t dest_len,
Expand Down