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

Resolve warnings on debian stable #183

Closed
wants to merge 2 commits into from
Closed

Resolve warnings on debian stable #183

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
baffd86
Fix build warnings with OpenSSL 3+
seanbright Dec 15, 2023
674d4cc
Resolve write(2) warning
seanbright Dec 15, 2023
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
76 changes: 42 additions & 34 deletions src/ks_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,56 +180,64 @@ KS_DECLARE(int) ks_gen_cert(const char *dir, const char *file)
return(0);
}

static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days)
static EVP_PKEY *generate_rsa_key(int bits)
{
X509 *x;
#if OPENSSL_VERSION_NUMBER >= 0x30000000
return EVP_RSA_gen(bits);
#else
EVP_PKEY *pk;
RSA *rsa;
X509_NAME *name = NULL;

ks_assert(pkeyp);
ks_assert(x509p);

if (*pkeyp == NULL) {
if ((pk = EVP_PKEY_new()) == NULL) {
abort();
}
} else {
pk = *pkeyp;
pk = EVP_PKEY_new();
if (pk == NULL) {
return NULL;
}

if (*x509p == NULL) {
if ((x = X509_new()) == NULL) {
goto err;
# if OPENSSL_VERSION_NUMBER >= 0x10100000
rsa = RSA_new();
{
static const BN_ULONG ULONG_RSA_F4 = RSA_F4;
BIGNUM* BN_value_RSA_F4 = BN_new();
if (!BN_value_RSA_F4) {
RSA_free(rsa);
EVP_PKEY_free(pk);
return NULL;
}
} else {
x = *x509p;
BN_set_word(BN_value_RSA_F4,ULONG_RSA_F4);
RSA_generate_key_ex(rsa, bits, BN_value_RSA_F4, NULL);
BN_free(BN_value_RSA_F4);
}
# else
rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
# endif

if (!EVP_PKEY_assign_RSA(pk, rsa)) {
RSA_free(rsa);
EVP_PKEY_free(pk);
return NULL;
}

#if OPENSSL_VERSION_NUMBER >= 0x10100000
rsa = RSA_new();
{
static const BN_ULONG ULONG_RSA_F4 = RSA_F4;
BIGNUM* BN_value_RSA_F4 = BN_new();
if (!BN_value_RSA_F4) {
abort();
goto err;
}
BN_set_word(BN_value_RSA_F4,ULONG_RSA_F4);
RSA_generate_key_ex(rsa, bits, BN_value_RSA_F4, NULL);
BN_free(BN_value_RSA_F4);
}
#else
rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
return pk;
#endif
}

if (!EVP_PKEY_assign_RSA(pk, rsa)) {
static int mkcert(X509 **x509p, EVP_PKEY **pkeyp, int bits, int serial, int days)
{
X509 *x;
EVP_PKEY *pk;
X509_NAME *name = NULL;

ks_assert(pkeyp);
ks_assert(x509p);

if ((pk = generate_rsa_key(bits)) == NULL) {
abort();
goto err;
}

rsa = NULL;
if ((x = X509_new()) == NULL) {
goto err;
}

X509_set_version(x, 0);
ASN1_INTEGER_set(X509_get_serialNumber(x), serial);
Expand Down
4 changes: 4 additions & 0 deletions src/kws.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,16 @@ static int b64encode(unsigned char *in, ks_size_t ilen, unsigned char *out, ks_s

static void sha1_digest(unsigned char *digest, char *in)
{
#if OPENSSL_VERSION_NUMBER >= 0x30000000
SHA1(in, strlen(in), digest);
#else
SHA_CTX sha;

SHA1_Init(&sha);
SHA1_Update(&sha, in, strlen(in));
SHA1_Final(digest, &sha);

#endif
}

/* fix me when we get real rand funcs in ks */
Expand Down
4 changes: 2 additions & 2 deletions src/simclist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ int ks_list_dump_filedescriptor(const ks_list_t *restrict l, int fd, ks_size_t *
WRITE_ERRCHECK(fd, ser_buf, bufsize);
}
else { /* speculation found broken */
WRITE_ERRCHECK(fd, &bufsize, sizeof(ks_size_t));
WRITE_ERRCHECK(fd, &bufsize, sizeof(uint32_t));
WRITE_ERRCHECK(fd, ser_buf, bufsize);
}
ks_pool_free(&ser_buf);
Expand All @@ -1379,7 +1379,7 @@ int ks_list_dump_filedescriptor(const ks_list_t *restrict l, int fd, ks_size_t *
WRITE_ERRCHECK(fd, x->data, bufsize);
}
else {
WRITE_ERRCHECK(fd, &bufsize, sizeof(ks_size_t));
WRITE_ERRCHECK(fd, &bufsize, sizeof(uint32_t));
WRITE_ERRCHECK(fd, x->data, bufsize);
}
}
Expand Down
4 changes: 4 additions & 0 deletions tests/testwebsock2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,15 @@ static void sha1_digest(char *digest, unsigned char *in)

static void sha1_digest(unsigned char *digest, char *in)
{
#if OPENSSL_VERSION_NUMBER >= 0x30000000
SHA1(in, strlen(in), digest);
#else
SHA_CTX sha;

SHA1_Init(&sha);
SHA1_Update(&sha, in, strlen(in));
SHA1_Final(digest, &sha);
#endif
}
#endif

Expand Down