Skip to content

Commit

Permalink
Use non-deprecated OpenSSL interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@flowerysong
flowerysong committed Oct 13, 2024
1 parent bd3e303 commit 4601503
Show file tree
Hide file tree
Showing 5 changed files with 321 additions and 557 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ file to determine which license(s) are applicable to that file.

In order to build OpenARC, you will need:

* [OpenSSL](https://openssl.org) >= 0.9.8
* [OpenSSL](https://openssl.org) >= 1.0.0
* Native implementations of `strlcat()` and `strlcpy()`,
[libbsd](https://libbsd.freedesktop.org/), or some other library that
provides them.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ openssl_found="no"

if test \( "$sslpath" = "auto" -o x"$sslpath" = x"yes" \) -a x"$PKG_CONFIG" != x""
then
PKG_CHECK_MODULES([LIBCRYPTO], [openssl >= 0.9.8],
PKG_CHECK_MODULES([LIBCRYPTO], [openssl >= 1.0.0],
[openssl_found="yes"],
[openssl_found="no"
AC_MSG_WARN([pkg-config for openssl not found, trying manual search...])
Expand Down
289 changes: 65 additions & 224 deletions libopenarc/arc-canon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,57 +70,28 @@ static void
arc_canon_free(ARC_MESSAGE *msg, ARC_CANON *canon)
{
assert(msg != NULL);
assert(canon != NULL);
if (canon == NULL)
{
return;
}

if (canon->canon_hash != NULL)
{
switch (canon->canon_hashtype)
{
case ARC_HASHTYPE_SHA1:
{
struct arc_sha1 *sha1;

sha1 = (struct arc_sha1 *) canon->canon_hash;

if (sha1->sha1_tmpbio != NULL)
{
BIO_free(sha1->sha1_tmpbio);
sha1->sha1_tmpfd = -1;
sha1->sha1_tmpbio = NULL;
}

break;
}

case ARC_HASHTYPE_SHA256:
{
struct arc_sha256 *sha256;

sha256 = (struct arc_sha256 *) canon->canon_hash;

if (sha256->sha256_tmpbio != NULL)
{
BIO_free(sha256->sha256_tmpbio);
sha256->sha256_tmpfd = -1;
sha256->sha256_tmpbio = NULL;
}

break;
}

default:
assert(0);
/* NOTREACHED */
}

#if OPENSSL_VERSION_NUMBER < 0x10100000L
EVP_MD_CTX_destroy(canon->canon_hash->hash_ctx);
#else
EVP_MD_CTX_free(canon->canon_hash->hash_ctx);
#endif /* OpenSSL < 1.1.0 */
BIO_free(canon->canon_hash->hash_tmpbio);
ARC_FREE(canon->canon_hash);
}

if (canon->canon_hashbuf != NULL)
ARC_FREE(canon->canon_hashbuf);
ARC_FREE(canon->canon_hashbuf);

if (canon->canon_buf != NULL)
{
arc_dstring_free(canon->canon_buf);
}

ARC_FREE(canon);
}
Expand Down Expand Up @@ -152,33 +123,10 @@ arc_canon_write(ARC_CANON *canon, u_char *buf, size_t buflen)

assert(canon->canon_hash != NULL);

switch (canon->canon_hashtype)
EVP_DigestUpdate(canon->canon_hash->hash_ctx, buf, buflen);
if (canon->canon_hash->hash_tmpbio != NULL)
{
case ARC_HASHTYPE_SHA1:
{
struct arc_sha1 *sha1;

sha1 = (struct arc_sha1 *) canon->canon_hash;
SHA1_Update(&sha1->sha1_ctx, buf, buflen);

if (sha1->sha1_tmpbio != NULL)
BIO_write(sha1->sha1_tmpbio, buf, buflen);

break;
}

case ARC_HASHTYPE_SHA256:
{
struct arc_sha256 *sha256;

sha256 = (struct arc_sha256 *) canon->canon_hash;
SHA256_Update(&sha256->sha256_ctx, buf, buflen);

if (sha256->sha256_tmpbio != NULL)
BIO_write(sha256->sha256_tmpbio, buf, buflen);

break;
}
BIO_write(canon->canon_hash->hash_tmpbio, buf, buflen);
}

if (canon->canon_remain != (ssize_t) -1)
Expand Down Expand Up @@ -557,6 +505,7 @@ ARC_STAT
arc_canon_init(ARC_MESSAGE *msg, _Bool tmp, _Bool keep)
{
int fd;
int rc;
ARC_STAT status;
ARC_CANON *cur;

Expand All @@ -577,78 +526,52 @@ arc_canon_init(ARC_MESSAGE *msg, _Bool tmp, _Bool keep)
if (cur->canon_buf == NULL)
return ARC_STAT_NORESOURCE;

switch (cur->canon_hashtype)
cur->canon_hash = ARC_MALLOC(sizeof(struct arc_hash));
if (cur->canon_hash == NULL)
{
case ARC_HASHTYPE_SHA1:
{
struct arc_sha1 *sha1;

sha1 = (struct arc_sha1 *) ARC_MALLOC(sizeof(struct arc_sha1));
if (sha1 == NULL)
{
arc_error(msg,
"unable to allocate %d byte(s)",
sizeof(struct arc_sha1));
return ARC_STAT_NORESOURCE;
}

memset(sha1, '\0', sizeof(struct arc_sha1));
SHA1_Init(&sha1->sha1_ctx);

if (tmp)
{
status = arc_tmpfile(msg, &fd, keep);
if (status != ARC_STAT_OK)
{
ARC_FREE(sha1);
return status;
}

sha1->sha1_tmpfd = fd;
sha1->sha1_tmpbio = BIO_new_fd(fd, 1);
}

cur->canon_hash = sha1;

break;
}

case ARC_HASHTYPE_SHA256:
{
struct arc_sha256 *sha256;

sha256 = (struct arc_sha256 *) ARC_MALLOC(sizeof(struct arc_sha256));
if (sha256 == NULL)
{
arc_error(msg,
"unable to allocate %d byte(s)",
sizeof(struct arc_sha256));
return ARC_STAT_NORESOURCE;
}
arc_error(msg, "unable to allocate %d bytes",
sizeof(struct arc_hash));
return ARC_STAT_NORESOURCE;
}
memset(cur->canon_hash, '\0', sizeof(struct arc_hash));

#if OPENSSL_VERSION_NUMBER < 0x10100000L
cur->canon_hash->hash_ctx = EVP_MD_CTX_create();
#else
cur->canon_hash->hash_ctx = EVP_MD_CTX_new();
#endif /* OpenSSL < 1.1.0 */
if (cur->canon_hash->hash_ctx == NULL)
{
arc_error(msg, "EVP_MD_CTX_new() failed");
return ARC_STAT_NORESOURCE;
}
if (cur->canon_hashtype == ARC_HASHTYPE_SHA1)
{
rc = EVP_DigestInit_ex(cur->canon_hash->hash_ctx,
EVP_sha1(), NULL);
}
else
{
rc = EVP_DigestInit_ex(cur->canon_hash->hash_ctx,
EVP_sha256(), NULL);
}

memset(sha256, '\0', sizeof(struct arc_sha256));
SHA256_Init(&sha256->sha256_ctx);
if (rc <= 0)
{
arc_error(msg, "EVP_DigestInit_ex() failed");
return ARC_STAT_INTERNAL;
}

if (tmp)
if (tmp)
{
status = arc_tmpfile(msg, &fd, keep);
if (status != ARC_STAT_OK)
{
status = arc_tmpfile(msg, &fd, keep);
if (status != ARC_STAT_OK)
{
ARC_FREE(sha256);
return status;
}

sha256->sha256_tmpfd = fd;
sha256->sha256_tmpbio = BIO_new_fd(fd, 1);
return status;
}

cur->canon_hash = sha256;

break;
}

default:
assert(0);
cur->canon_hash->hash_tmpfd = fd;
cur->canon_hash->hash_tmpbio = BIO_new_fd(fd, 1);
}
}

Expand Down Expand Up @@ -1059,37 +982,11 @@ arc_canon_finalize(ARC_CANON *canon)
{
assert(canon != NULL);

switch (canon->canon_hashtype)
{
case ARC_HASHTYPE_SHA1:
{
struct arc_sha1 *sha1;

sha1 = (struct arc_sha1 *) canon->canon_hash;
SHA1_Final(sha1->sha1_out, &sha1->sha1_ctx);

if (sha1->sha1_tmpbio != NULL)
(void) BIO_flush(sha1->sha1_tmpbio);

break;
}

case ARC_HASHTYPE_SHA256:
{
struct arc_sha256 *sha256;

sha256 = (struct arc_sha256 *) canon->canon_hash;
SHA256_Final(sha256->sha256_out, &sha256->sha256_ctx);

if (sha256->sha256_tmpbio != NULL)
(void) BIO_flush(sha256->sha256_tmpbio);
EVP_DigestFinal(canon->canon_hash->hash_ctx, canon->canon_hash->hash_out, &canon->canon_hash->hash_outlen);

break;
}

default:
assert(0);
/* NOTREACHED */
if (canon->canon_hash->hash_tmpbio != NULL)
{
BIO_flush(canon->canon_hash->hash_tmpbio);
}
}

Expand Down Expand Up @@ -1907,38 +1804,7 @@ arc_canon_closebody(ARC_MESSAGE *msg)
arc_canon_buffer(cur, NULL, 0);

/* finalize */
switch (cur->canon_hashtype)
{
case ARC_HASHTYPE_SHA1:
{
struct arc_sha1 *sha1;

sha1 = (struct arc_sha1 *) cur->canon_hash;
SHA1_Final(sha1->sha1_out, &sha1->sha1_ctx);

if (sha1->sha1_tmpbio != NULL)
(void) BIO_flush(sha1->sha1_tmpbio);

break;
}

case ARC_HASHTYPE_SHA256:
{
struct arc_sha256 *sha256;

sha256 = (struct arc_sha256 *) cur->canon_hash;
SHA256_Final(sha256->sha256_out, &sha256->sha256_ctx);

if (sha256->sha256_tmpbio != NULL)
(void) BIO_flush(sha256->sha256_tmpbio);

break;
}

default:
assert(0);
/* NOTREACHED */
}
arc_canon_finalize(cur);

cur->canon_done = TRUE;
}
Expand Down Expand Up @@ -1968,35 +1834,10 @@ arc_canon_getfinal(ARC_CANON *canon, u_char **digest, size_t *dlen)
if (!canon->canon_done)
return ARC_STAT_INVALID;

switch (canon->canon_hashtype)
{
case ARC_HASHTYPE_SHA1:
{
struct arc_sha1 *sha1;

sha1 = (struct arc_sha1 *) canon->canon_hash;
*digest = sha1->sha1_out;
*dlen = sizeof sha1->sha1_out;

return ARC_STAT_OK;
}

case ARC_HASHTYPE_SHA256:
{
struct arc_sha256 *sha256;
*digest = canon->canon_hash->hash_out;
*dlen = canon->canon_hash->hash_outlen;

sha256 = (struct arc_sha256 *) canon->canon_hash;
*digest = sha256->sha256_out;
*dlen = sizeof sha256->sha256_out;

return ARC_STAT_OK;
}

default:
assert(0);
/* NOTREACHED */
return ARC_STAT_INTERNAL;
}
return ARC_STAT_OK;
}

/*
Expand Down
Loading

0 comments on commit 4601503

Please sign in to comment.