Skip to content

Commit

Permalink
digest_auth: restore support openssl for 1.0.2
Browse files Browse the repository at this point in the history 
This completes commit f566fb which used a new interface of openssl, one
that is not available in 1.0.2.
Many thanks to Oleksandr Kozmenko (@11qeq11 on GitHub) for reporting it.
Close #3183
  • Loading branch information
@razvancrainea
razvancrainea committed Sep 21, 2023
1 parent 3b4beb2 commit 3c11d3c
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 53 deletions.
9 changes: 5 additions & 4 deletions lib/digest_auth/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ LIBS=

CPP_CMD?=cpp

SHA_256_SUPPORT:= $(shell printf '\#define SHA256_Init(x) \
_TEST_P_A_S_S_E_D_()\n\#include <openssl/sha.h>\n' \
SHA_256_SUPPORT:= $(shell printf '#define SHA256_Init(x) \
_TEST_P_A_S_S_E_D_()\n#include <openssl/sha.h>\n' \
| $(CPP_CMD) $(DEFS) 2>/dev/null | grep -q _TEST_P_A_S_S_E_D_ && echo yes)

SHA_512_256_SUPPORT:= $(shell printf '\#define EVP_sha512_256(x) \
_TEST_P_A_S_S_E_D_()\n\#include <openssl/evp.h>\n' \
SHA_512_256_SUPPORT:= $(shell printf '#define EVP_sha512_256(x) \
_TEST_P_A_S_S_E_D_()\n#include <openssl/evp.h>\n' \
| $(CPP_CMD) $(DEFS) 2>/dev/null | grep -q _TEST_P_A_S_S_E_D_ && echo yes)


ifeq ($(SHA_256_SUPPORT)$(SHA_256_SUPPORT_DISABLE),yes)
DEFS+=-DSHA_256_ENABLE
else
Expand Down
142 changes: 93 additions & 49 deletions lib/digest_auth/dauth_calc_sha256.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <openssl/sha.h>
#include <openssl/evp.h>
#include <openssl/opensslv.h>

#include "../../str.h"
#include "../../parser/digest/digest_parser.h"
Expand All @@ -36,25 +37,75 @@
#include "dauth_calc.h"
#include "dauth_hexops.h"

#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
#define OS_SHA256_Declare(ctxpp) SHA256_CTX ctxpp
#define OS_SHA256_Init(ctxpp) SHA256_Init(ctxpp)
#define OS_SHA256_Update(ctxpp, m, mlen) SHA256_Update((ctxpp), m, mlen)
#define OS_SHA256_Final(ctxpp, _h) SHA256_Final((unsigned char *)_h, (ctxpp));

#define OS_SHA256(ctxpp, m, mlen, h) \
do { \
OS_SHA256_Init(ctxpp); \
OS_SHA256_Update(ctxpp, m, mlen); \
OS_SHA256_Final(ctxpp, h); \
} while(0)

#else /* OPENSSL_VERSION_NUMBER */

#define OS_SHA256_Declare(ctxpp) EVP_MD_CTX *ctxpp

#define OS_SHA256_Init(ctxpp) \
do { \
*(ctxpp) = EVP_MD_CTX_new(); \
if (*(ctxpp) == NULL) \
return -1; \
if (EVP_DigestInit(*(ctxpp), EVP_sha256()) != 1) { \
EVP_MD_CTX_free(*(ctxpp)); \
return -1; \
} \
} while(0)

#define OS_SHA256_Final(ctxpp, _h) \
do { \
unsigned int olen = 0; \
if (EVP_DigestFinal_ex(*(ctxpp), (unsigned char *)(_h), &olen) != 1) { \
EVP_MD_CTX_free(*(ctxpp)); \
return -1; \
} \
EVP_MD_CTX_free(*(ctxpp)); \
DASSERT(olen == HASHLEN_SHA256); \
*(ctxpp) = NULL; \
} while(0)

#define OS_SHA256_Update(ctxpp, m, mlen) \
do { \
if (EVP_DigestUpdate(*(ctxpp), m, mlen) != 1) { \
EVP_MD_CTX_free(*(ctxpp)); \
return -1; \
} \
} while (0);

#define OS_SHA256(ctxpp, m, mlen, h) \
SHA256((unsigned char *)(m), (mlen), (unsigned char *)(h));

#endif /* OPENSSL_VERSION_NUMBER */

/*
* calculate H(A1)
*/
static int digest_calc_HA1(const struct digest_auth_credential *crd,
HASHHEX *sess_key)
{
EVP_MD_CTX *Sha256Ctx;
HASH_SHA256 HA1;
OS_SHA256_Declare(Sha256Ctx);

Sha256Ctx = EVP_MD_CTX_new();

EVP_DigestInit(Sha256Ctx, EVP_sha256());
EVP_DigestUpdate(Sha256Ctx, crd->user.s, crd->user.len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, crd->realm.s, crd->realm.len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, crd->passwd.s, crd->passwd.len);
EVP_DigestFinal_ex(Sha256Ctx, (unsigned char *)HA1, NULL);
EVP_MD_CTX_free(Sha256Ctx);
OS_SHA256_Init(&Sha256Ctx);
OS_SHA256_Update(&Sha256Ctx, crd->user.s, crd->user.len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, crd->realm.s, crd->realm.len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, crd->passwd.s, crd->passwd.len);
OS_SHA256_Final(&Sha256Ctx, HA1);

cvt_hex128(HA1, sess_key->SHA256, HASHLEN_SHA256, HASHHEXLEN_SHA256);

Expand All @@ -65,19 +116,17 @@ static int digest_calc_HA1(const struct digest_auth_credential *crd,
static int digest_calc_HA1sess(const str_const *nonce, const str_const *cnonce,
HASHHEX *sess_key)
{
EVP_MD_CTX *Sha256Ctx;
HASH_SHA256 HA1;
OS_SHA256_Declare(Sha256Ctx);

Sha256Ctx = EVP_MD_CTX_new();
OS_SHA256_Init(&Sha256Ctx);
OS_SHA256_Update(&Sha256Ctx, sess_key->SHA256, HASHHEXLEN_SHA256);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, nonce->s, nonce->len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, cnonce->s, cnonce->len);
OS_SHA256_Final(&Sha256Ctx, HA1);

EVP_DigestInit(Sha256Ctx, EVP_sha256());
EVP_DigestUpdate(Sha256Ctx, sess_key->SHA256, HASHHEXLEN_SHA256);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, nonce->s, nonce->len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, cnonce->s, cnonce->len);
EVP_DigestFinal(Sha256Ctx, (unsigned char *)HA1, NULL);
EVP_MD_CTX_free(Sha256Ctx);
cvt_hex128(HA1, sess_key->SHA256, HASHLEN_SHA256, HASHHEXLEN_SHA256);

return 0;
Expand All @@ -89,32 +138,29 @@ static int digest_calc_HA1sess(const str_const *nonce, const str_const *cnonce,
static int digest_calc_HA2(const str_const *msg_body, const str_const *method,
const str_const *uri, int auth_int, HASHHEX *HA2Hex)
{
EVP_MD_CTX *Sha256Ctx;
HASH_SHA256 HA2;
HASH_SHA256 HENTITY;
HASHHEX_SHA256 HENTITYHex;
OS_SHA256_Declare(Sha256Ctx);

if (auth_int) {
SHA256((unsigned char *)msg_body->s, msg_body->len, (unsigned char *)HENTITY);
OS_SHA256(&Sha256Ctx, msg_body->s, msg_body->len, HENTITY);
cvt_hex128(HENTITY, HENTITYHex, HASHLEN_SHA256, HASHHEXLEN_SHA256);
}

Sha256Ctx = EVP_MD_CTX_new();

EVP_DigestInit(Sha256Ctx, EVP_sha256());
OS_SHA256_Init(&Sha256Ctx);
if (method->s) {
EVP_DigestUpdate(Sha256Ctx, method->s, method->len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, method->s, method->len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
}
EVP_DigestUpdate(Sha256Ctx, uri->s, uri->len);
OS_SHA256_Update(&Sha256Ctx, uri->s, uri->len);

if (auth_int) {
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, HENTITYHex, HASHHEXLEN_SHA256);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, HENTITYHex, HASHHEXLEN_SHA256);
};

EVP_DigestFinal_ex(Sha256Ctx, (unsigned char *)HA2, NULL);
EVP_MD_CTX_free(Sha256Ctx);
OS_SHA256_Final(&Sha256Ctx, HA2);
cvt_hex128(HA2, HA2Hex->SHA256, HASHLEN_SHA256, HASHHEXLEN_SHA256);
return 0;
}
Expand All @@ -126,28 +172,26 @@ static int _digest_calc_response(const HASHHEX *ha1, const HASHHEX *ha2,
const str_const *nonce, const str_const *qop_val, const str_const *nc,
const str_const *cnonce, struct digest_auth_response *response)
{
EVP_MD_CTX *Sha256Ctx;
OS_SHA256_Declare(Sha256Ctx);

Sha256Ctx = EVP_MD_CTX_new();
OS_SHA256_Init(&Sha256Ctx);

EVP_DigestInit(Sha256Ctx, EVP_sha256());
EVP_DigestUpdate(Sha256Ctx, ha1->SHA256, HASHHEXLEN_SHA256);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, nonce->s, nonce->len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, ha1->SHA256, HASHHEXLEN_SHA256);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, nonce->s, nonce->len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);

if (qop_val && qop_val->s && qop_val->len != 0)
{
EVP_DigestUpdate(Sha256Ctx, nc->s, nc->len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, cnonce->s, cnonce->len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
EVP_DigestUpdate(Sha256Ctx, qop_val->s, qop_val->len);
EVP_DigestUpdate(Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, nc->s, nc->len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, cnonce->s, cnonce->len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
OS_SHA256_Update(&Sha256Ctx, qop_val->s, qop_val->len);
OS_SHA256_Update(&Sha256Ctx, ":", 1);
};
EVP_DigestUpdate(Sha256Ctx, ha2->SHA256, HASHHEXLEN_SHA256);
EVP_DigestFinal(Sha256Ctx, (unsigned char *)response->RespHash.SHA256, NULL);
EVP_MD_CTX_free(Sha256Ctx);
OS_SHA256_Update(&Sha256Ctx, ha2->SHA256, HASHHEXLEN_SHA256);
OS_SHA256_Final(&Sha256Ctx, response->RespHash.SHA256);
return 0;
}

Expand Down

0 comments on commit 3c11d3c

Please sign in to comment.