Skip to content

Commit

Permalink
digest: add AKAv1 and AKAv2 parsers
Browse files Browse the repository at this point in the history
  • Loading branch information
@razvancrainea @bogdan-iancu
razvancrainea authored and bogdan-iancu committed Apr 18, 2024
1 parent 78bdec9 commit 4cb787c
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/digest_auth/digest_auth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

/* First/Last supported algorithm */
#define FIRST_ALG_SPTD (ALG_UNSPEC)
#define LAST_ALG_SPTD (ALG_SHA512_256SESS)
#define LAST_ALG_SPTD (ALG_OTHER-1)

typedef union {
HASH_MD5 MD5;
Expand Down
12 changes: 12 additions & 0 deletions parser/digest/digest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,18 @@ void print_cred(dig_cred_t* _c)
CASE_PRINTENUM(ALG_SHA256SESS);
CASE_PRINTENUM(ALG_SHA512_256);
CASE_PRINTENUM(ALG_SHA512_256SESS);
CASE_PRINTENUM(ALG_AKAv1_MD5);
CASE_PRINTENUM(ALG_AKAv1_MD5SESS);
CASE_PRINTENUM(ALG_AKAv1_SHA256);
CASE_PRINTENUM(ALG_AKAv1_SHA256SESS);
CASE_PRINTENUM(ALG_AKAv1_SHA512_256);
CASE_PRINTENUM(ALG_AKAv1_SHA512_256SESS);
CASE_PRINTENUM(ALG_AKAv2_MD5);
CASE_PRINTENUM(ALG_AKAv2_MD5SESS);
CASE_PRINTENUM(ALG_AKAv2_SHA256);
CASE_PRINTENUM(ALG_AKAv2_SHA256SESS);
CASE_PRINTENUM(ALG_AKAv2_SHA512_256);
CASE_PRINTENUM(ALG_AKAv2_SHA512_256SESS);
CASE_PRINTENUM(ALG_OTHER);
}

Expand Down
26 changes: 26 additions & 0 deletions parser/digest/digest_parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@
#define ALG_SHA256SESS_STR_LEN (sizeof(ALG_SHA256SESS_STR) - 1)
#define ALG_SHA512_256_STR_LEN (sizeof(ALG_SHA512_256_STR) - 1)
#define ALG_SHA512_256SESS_STR_LEN (sizeof(ALG_SHA512_256SESS_STR) - 1)
#define ALG_AKAv1_MD5_STR_LEN (sizeof(ALG_AKAv1_MD5_STR) - 1)
#define ALG_AKAv1_MD5SESS_STR_LEN (sizeof(ALG_AKAv1_MD5SESS_STR) - 1)
#define ALG_AKAv1_SHA256_STR_LEN (sizeof(ALG_AKAv1_SHA256_STR) - 1)
#define ALG_AKAv1_SHA256SESS_STR_LEN (sizeof(ALG_AKAv1_SHA256SESS_STR) - 1)
#define ALG_AKAv1_SHA512_256_STR_LEN (sizeof(ALG_AKAv1_SHA512_256_STR) - 1)
#define ALG_AKAv1_SHA512_256SESS_STR_LEN (sizeof(ALG_AKAv1_SHA512_256SESS_STR) - 1)
#define ALG_AKAv2_MD5_STR_LEN (sizeof(ALG_AKAv2_MD5_STR) - 1)
#define ALG_AKAv2_MD5SESS_STR_LEN (sizeof(ALG_AKAv2_MD5SESS_STR) - 1)
#define ALG_AKAv2_SHA256_STR_LEN (sizeof(ALG_AKAv2_SHA256_STR) - 1)
#define ALG_AKAv2_SHA256SESS_STR_LEN (sizeof(ALG_AKAv2_SHA256SESS_STR) - 1)
#define ALG_AKAv2_SHA512_256_STR_LEN (sizeof(ALG_AKAv2_SHA512_256_STR) - 1)
#define ALG_AKAv2_SHA512_256SESS_STR_LEN (sizeof(ALG_AKAv2_SHA512_256SESS_STR) - 1)

/*
* Parse quoted string in a parameter body
Expand Down Expand Up @@ -230,6 +242,14 @@ static inline void parse_qop(struct qp* _q)
return ALG_##alg; \
break;

#define CASE_ALG2(alg1, alg2, sptr) \
case ALG_##alg1##_STR_LEN: \
if (turbo_casematch((sptr)->s, ALG_##alg1##_STR, (sptr)->len)) \
return ALG_##alg1; \
if (turbo_casematch((sptr)->s, ALG_##alg2##_STR, (sptr)->len)) \
return ALG_##alg2; \
break;

/*
* Parse algorithm parameter body
*/
Expand All @@ -243,6 +263,12 @@ alg_t parse_digest_algorithm(const str *sp)
CASE_ALG(SHA256SESS, sp);
CASE_ALG(SHA512_256, sp);
CASE_ALG(SHA512_256SESS, sp);
CASE_ALG2(AKAv1_MD5, AKAv2_MD5, sp);
CASE_ALG2(AKAv1_MD5SESS, AKAv2_MD5SESS, sp);
CASE_ALG2(AKAv1_SHA256, AKAv2_SHA256, sp);
CASE_ALG2(AKAv1_SHA256SESS, AKAv2_SHA256SESS, sp);
CASE_ALG2(AKAv1_SHA512_256, AKAv2_SHA512_256, sp);
CASE_ALG2(AKAv1_SHA512_256SESS, AKAv2_SHA512_256SESS, sp);
default:
break;
}
Expand Down
47 changes: 46 additions & 1 deletion parser/digest/digest_parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,23 @@ typedef enum alg {
ALG_SHA256SESS = 4, /* SHA-256-Session */
ALG_SHA512_256 = 5, /* SHA-512/256 */
ALG_SHA512_256SESS = 6, /* SHA-512/256-Session */
ALG_OTHER = 7 /* Unknown */
ALG_AKAv1_FIRST = 7, /* First AKAv1 algorithm */
ALG_AKAv1_MD5 = 7, /* AKAv1-MD5 */
ALG_AKAv1_MD5SESS = 8, /* AKAv1-MD5-Session */
ALG_AKAv1_SHA256 = 9, /* AKAv1-SHA-256 */
ALG_AKAv1_SHA256SESS = 10, /* AKAv1-SHA-256-Session */
ALG_AKAv1_SHA512_256 = 11, /* AKAv1-SHA-512/256 */
ALG_AKAv1_SHA512_256SESS = 12, /* AKAv1-SHA-512/256-Session */
ALG_AKAv1_LAST = 12, /* Last AKAv1 algorithm */
ALG_AKAv2_FIRST = 13, /* First AKAv2 algorithm */
ALG_AKAv2_MD5 = 13, /* AKAv2-MD5 */
ALG_AKAv2_MD5SESS = 14, /* AKAv2-MD5-Session */
ALG_AKAv2_SHA256 = 15, /* AKAv2-SHA-256 */
ALG_AKAv2_SHA256SESS = 16,/* AKAv2-SHA-256-Session */
ALG_AKAv2_SHA512_256 = 17,/* AKAv2-SHA-512/256 */
ALG_AKAv2_SHA512_256SESS = 18, /* AKAv2-SHA-512/256-Session */
ALG_AKAv2_LAST = 18, /* Last AKAv2 algorithm */
ALG_OTHER = 19 /* Unknown */
} alg_t;

#define ALG2ALGFLG(_alg) (1 << (_alg))
Expand All @@ -54,6 +70,18 @@ typedef enum alg {
#define ALGFLG_SHA256SESS ALG2ALGFLG(ALG_SHA256SESS)
#define ALGFLG_SHA512_256 ALG2ALGFLG(ALG_SHA512_256)
#define ALGFLG_SHA512_256SESS ALG2ALGFLG(ALG_SHA512_256SESS)
#define ALGFLG_AKAv1_MD5 ALG2ALGFLG(ALG_AKAv1_MD5)
#define ALGFLG_AKAv1_MD5SESS ALG2ALGFLG(ALG_AKAv1_MD5SESS)
#define ALGFLG_AKAv1_SHA256 ALG2ALGFLG(ALG_AKAv1_SHA256)
#define ALGFLG_AKAv1_SHA256SESS ALG2ALGFLG(ALG_AKAv1_SHA256SESS)
#define ALGFLG_AKAv1_SHA512_256 ALG2ALGFLG(ALG_AKAv1_SHA512_256)
#define ALGFLG_AKAv1_SHA512_256SESS ALG2ALGFLG(ALG_AKAv1_SHA512_256SESS)
#define ALGFLG_AKAv2_MD5 ALG2ALGFLG(ALG_AKAv2_MD5)
#define ALGFLG_AKAv2_MD5SESS ALG2ALGFLG(ALG_AKAv2_MD5SESS)
#define ALGFLG_AKAv2_SHA256 ALG2ALGFLG(ALG_AKAv2_SHA256)
#define ALGFLG_AKAv2_SHA256SESS ALG2ALGFLG(ALG_AKAv2_SHA256SESS)
#define ALGFLG_AKAv2_SHA512_256 ALG2ALGFLG(ALG_AKAv2_SHA512_256)
#define ALGFLG_AKAv2_SHA512_256SESS ALG2ALGFLG(ALG_AKAv2_SHA512_256SESS)

/* Canonical algorithm names */
#define ALG_SESS_SFX "-sess"
Expand All @@ -63,6 +91,23 @@ typedef enum alg {
#define ALG_SHA256SESS_STR ALG_SHA256_STR ALG_SESS_SFX
#define ALG_SHA512_256_STR "SHA-512-256"
#define ALG_SHA512_256SESS_STR ALG_SHA512_256_STR ALG_SESS_SFX
#define ALG_AKAv1_PRX "AKAv1-"
#define ALG_AKAv1_MD5_STR ALG_AKAv1_PRX ALG_MD5_STR
#define ALG_AKAv1_MD5SESS_STR ALG_AKAv1_PRX ALG_MD5SESS_STR
#define ALG_AKAv1_SHA256_STR ALG_AKAv1_PRX ALG_SHA256_STR
#define ALG_AKAv1_SHA256SESS_STR ALG_AKAv1_PRX ALG_SHA256SESS_STR
#define ALG_AKAv1_SHA512_256_STR ALG_AKAv1_PRX ALG_SHA512_256_STR
#define ALG_AKAv1_SHA512_256SESS_STR ALG_AKAv1_PRX ALG_SHA512_256SESS_STR
#define ALG_AKAv2_PRX "AKAv2-"
#define ALG_AKAv2_MD5_STR ALG_AKAv2_PRX ALG_MD5_STR
#define ALG_AKAv2_MD5SESS_STR ALG_AKAv2_PRX ALG_MD5SESS_STR
#define ALG_AKAv2_SHA256_STR ALG_AKAv2_PRX ALG_SHA256_STR
#define ALG_AKAv2_SHA256SESS_STR ALG_AKAv2_PRX ALG_SHA256SESS_STR
#define ALG_AKAv2_SHA512_256_STR ALG_AKAv2_PRX ALG_SHA512_256_STR
#define ALG_AKAv2_SHA512_256SESS_STR ALG_AKAv2_PRX ALG_SHA512_256SESS_STR

#define ALG_IS_AKAv1(alg) (alg >= ALG_AKAv1_FIRST && alg <= ALG_AKAv1_LAST)
#define ALG_IS_AKAv2(alg) (alg >= ALG_AKAv2_FIRST && alg <= ALG_AKAv2_LAST)

/* Quality Of Protection used */
typedef enum qop_type {
Expand Down

0 comments on commit 4cb787c

Please sign in to comment.