Skip to content

Version fixes for libressl on openbsd #60

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

Merged
toddr merged 2 commits into from
May 10, 2025
Merged

Version fixes for libressl on openbsd #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a8f0a
libressl message digest functions md cannot be NULL
timlegge May 9, 2025
c7b5191
Don't support whirlpool in libressl
timlegge May 9, 2025
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
24 changes: 13 additions & 11 deletions RSA.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
#include <openssl/rand.h>
#include <openssl/ripemd.h>
#if OPENSSL_VERSION_NUMBER >= 0x10000000 & OPENSSL_VERSION_NUMBER < 0x30000000
#ifndef LIBRESSL_VERSION_NUMBER
#include <openssl/whrlpool.h>
#endif
#endif
#include <openssl/rsa.h>
#include <openssl/sha.h>
#include <openssl/ssl.h>
Expand Down Expand Up @@ -200,47 +202,47 @@ unsigned char* get_message_digest(SV* text_SV, int hash_method)
{
STRLEN text_length;
unsigned char* text;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
static unsigned char md[EVP_MAX_MD_SIZE];
#endif
unsigned char *md;
static unsigned char m[EVP_MAX_MD_SIZE];
text = (unsigned char*) SvPV(text_SV, text_length);
md = m;

switch(hash_method)
{
case NID_md5:
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
return EVP_Q_digest(NULL, "MD5", NULL, text, text_length, md, NULL) ? md : NULL;
#else
return MD5(text, text_length, NULL);
return MD5(text, text_length, md);
#endif
break;
case NID_sha1:
return SHA1(text, text_length, NULL);
return SHA1(text, text_length, md);
break;
#ifdef SHA512_DIGEST_LENGTH
case NID_sha224:
return SHA224(text, text_length, NULL);
return SHA224(text, text_length, md);
break;
case NID_sha256:
return SHA256(text, text_length, NULL);
return SHA256(text, text_length, md);
break;
case NID_sha384:
return SHA384(text, text_length, NULL);
return SHA384(text, text_length, md);
break;
case NID_sha512:
return SHA512(text, text_length, NULL);
return SHA512(text, text_length, md);
break;
#endif
case NID_ripemd160:
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
return EVP_Q_digest(NULL, "RIPEMD160", NULL, text, text_length, md, NULL) ? md : NULL;
#else
return RIPEMD160(text, text_length, NULL);
return RIPEMD160(text, text_length, md);
#endif
break;
#ifdef WHIRLPOOL_DIGEST_LENGTH
case NID_whirlpool:
return WHIRLPOOL(text, text_length, NULL);
return WHIRLPOOL(text, text_length, md);
break;
#endif
default:
Expand Down