encode OID subidentifier value 0 as single 0x00 byte

Signed-off-by: ethan-thompson <ethan.thompson@networkradius.com>

diff --git a/src/protocols/der/encode.c b/src/protocols/der/encode.c
index 75bee5c8a19ed4bdd8663bf6d73329455c07548d..c6d668648f6ec9add7f0124b575aecfd566c19cb 100644 (file)
--- a/src/protocols/der/encode.c
+++ b/src/protocols/der/encode.c
@@ -590,6 +590,7 @@ static ssize_t fr_der_encode_oid_from_value(fr_dbuff_t *dbuff, uint64_t value, u
 {
        fr_dbuff_t      our_dbuff;
        int             i;
+       bool            wrote = false;
        uint64_t        oid;
 
        /*
@@ -632,12 +633,16 @@ static ssize_t fr_der_encode_oid_from_value(fr_dbuff_t *dbuff, uint64_t value, u
        for (i = 63; i >= 0; i -= 7) {
                uint8_t more, part;
 
+               /*
+                *      Skip leading zeroes, but not intermediate ones.
+                */
                part = (oid >> i) & 0x7f;
-               if (!part) continue;
+               if (!part && !wrote && (i > 0)) continue;
 
                more = ((uint8_t) (i > 0)) << 7;
 
                FR_DBUFF_IN_RETURN(&our_dbuff, (uint8_t) (more | part));
+               wrote = true;
        }
 
        (*count)++;