]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Remove duplicate function asn1_bit_string_set_unused_bits
authorNorbert Pocs <norbertp@openssl.org>
Mon, 6 Apr 2026 12:34:08 +0000 (14:34 +0200)
committerNikola Pajkovsky <nikolap@openssl.org>
Mon, 13 Apr 2026 07:11:01 +0000 (09:11 +0200)
Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Mon Apr 13 07:11:12 2026
(Merged from https://github.com/openssl/openssl/pull/30746)

crypto/asn1/a_bitstr.c

index 36aaacc310880459c5a41c9f4c3fbb8eca4aca07..ebd1417923187baf96ea5fd9af31359667a6f3fa 100644 (file)
 
 #include <crypto/asn1.h>
 
-static void
-asn1_bit_string_clear_unused_bits(ASN1_BIT_STRING *abs)
-{
-    abs->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
-}
-
-static int asn1_bit_string_set_unused_bits(ASN1_BIT_STRING *abs,
-    uint8_t unused_bits)
-{
-    if (unused_bits > 7)
-        return 0;
-
-    asn1_bit_string_clear_unused_bits(abs);
-
-    abs->flags |= ASN1_STRING_FLAG_BITS_LEFT | unused_bits;
-
-    return 1;
-}
-
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
     return ASN1_STRING_set(x, d, len);
@@ -187,9 +168,7 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
             unused_bits -= 2;
         if ((u8 & 0x55) != 0)
             unused_bits -= 1;
-
-        if (!asn1_bit_string_set_unused_bits(a, unused_bits))
-            return 0;
+        ossl_asn1_bit_string_set_unused_bits(a, unused_bits);
     }
     return 1;
 }