fix some doc

Author: arckoor

doc/api_ref/ffi.rst

@@ -2117,9 +2117,9 @@ X.509 Certificates
                   size_t* v4_count, \
                   size_t* v6_count)
 
-   Get info about the IP Address Blocks extension from `RFC 3779 <https://www.rfc-editor.org/rfc/rfc3779>`.
-   `v4_count` is be set to the number of v4 families contained in the extension,
-   `v6_count` to the number of v6 families. If the extension is not present, `BOTAN_FFI_ERROR_NO_VALUE` is be returned.
+   Get info about the IP Address Blocks extension from `RFC 3779 <https://www.rfc-editor.org/rfc/rfc3779>`_.
+   ``v4_count`` is set to the number of v4 families contained in the extension,
+   ``v6_count`` to the number of v6 families. If the extension is not present, :cpp:enumerator:`BOTAN_FFI_ERROR_NO_VALUE` is returned.
 
 .. cpp:function:: int botan_x509_ext_ip_addr_blocks_get_family(botan_x509_cert_t cert, \
                   size_t v4_count, \
@@ -2131,13 +2131,13 @@ X.509 Certificates
                   size_t* count)
 
    Get info about a specific family in the extension.
-   `v4_count` is obtained from `botan_x509_ext_ip_addr_blocks_get_counts`, `ipv6` should be set to 0 for v4 families,
-   1 for v6 families. `i` is the local index for each family type, the first v4 family is at `i = 0`,
-   `ipv6 = 0`, the first v6 family is at `i = 0`, `ipv6 = 1`.
-   `has_safi` is be set to 1 if the family has an associated SAFI, else 0.
-   `safi` contains the SAFI if the family has one, otherwise its value is undefined.
-   `present` is set to 1 if the family has range values, 0 if it is marked as "inherit".
-   `count` is set to the number of ranges contained if any, otherwise its value is undefined.
+   ``v4_count`` is obtained from :cpp:func:`botan_x509_ext_ip_addr_blocks_get_counts`, ``ipv6`` should be set to 0 for v4 families,
+   1 for v6 families. ``i`` is the local index for each family type, the first v4 family is at ``i = 0``,
+   ``ipv6 = 0``, the first v6 family is at ``i = 0``, ``ipv6 = 1``.
+   ``has_safi`` is set to 1 if the family has an associated SAFI, else 0.
+   ``safi`` contains the SAFI if the family has one, otherwise its value is undefined.
+   ``present`` is set to 1 if the family has range values, 0 if it is marked as "inherit".
+   ``count`` is set to the number of ranges contained if any, otherwise its value is undefined.
 
 .. cpp:function:: int botan_x509_ext_ip_addr_blocks_get_address(botan_x509_cert_t cert, \
                   size_t v4_count, \
@@ -2149,21 +2149,21 @@ X.509 Certificates
                   size_t* out_len)
 
    Get info about a specific range in the extension.
-   `v4_count`, `ipv6` and `i` behave as in `botan_x509_ext_ip_addr_blocks_get_family`.
-   `entry` is the index to the range in the family, between 0 and (not including) `count`.
-   `min_out` and `max_out` are set to the min and max addresses of the range respectively.
-   `out_len` should be set to 4 for v4 families, 16 for v6 families, the two arrays must also be that size.
+   ``v4_count``, ``ipv6`` and ``i`` behave as in `botan_x509_ext_ip_addr_blocks_get_family`.
+   ``entry`` is the index to the range in the family, between 0 and (not including) ``count``.
+   ``min_out`` and ``max_out`` are set to the min and max addresses of the range respectively.
+   ``out_len`` should be set to 4 for v4 families, 16 for v6 families, the two arrays must also be that size.
 
 .. cpp:function:: int botan_x509_ext_as_blocks_get_info(botan_x509_cert_t cert, \
                   int asnum, \
                   int* present, \
                   size_t* count)
 
-   Get info about the AS Blocks extension from `RFC 3779 <https://www.rfc-editor.org/rfc/rfc3779>`.
-   `asnum` should be set to 1 to get info about the ASNUM part of the extension, 0 for RDI.
-   `present` is set to 1 if a value is contained, 0 if that part of the extension is marked as "inherit".
-   If the part is not present at all, `BOTAN_FFI_ERROR_NO_VALUE` will be returned.
-   `count` is set to the number of entries for that part if any, otherwise its value is undefined.
+   Get info about the AS Blocks extension from `RFC 3779 <https://www.rfc-editor.org/rfc/rfc3779>`_.
+   ``asnum`` should be set to 1 to get info about the ASNUM part of the extension, 0 for RDI.
+   ``present`` is set to 1 if a value is contained, 0 if that part of the extension is marked as "inherit".
+   If the part is not present at all, :cpp:enumerator:`BOTAN_FFI_ERROR_NO_VALUE` will be returned.
+   ``count`` is set to the number of entries for that part if any, otherwise its value is undefined.
 
 
 .. cpp:function:: int botan_x509_ext_as_blocks_get_entry_at(botan_x509_cert_t cert, \
@@ -2173,9 +2173,9 @@ X.509 Certificates
                   uint32_t* max)
 
    Get info about a specific entry from the extension.
-   `asnum` behaves as in `botan_x509_ext_as_blocks_get_info`, `i` is the index for that part,
-   between 0 and (not including) `count`.
-   `min` and `max` will be set to the minimum and maximum AS numbers of the range respectively.
+   ``asnum`` behaves as in :cpp:func:`botan_x509_ext_as_blocks_get_info`, ``i`` is the index for that part,
+   between 0 and (not including) ``count``.
+   ``min`` and ``max`` will be set to the minimum and maximum AS numbers of the range respectively.
 
 X.509 Certificate Revocation Lists
 ----------------------------------------

src/lib/ffi/ffi.h

@@ -2730,7 +2730,7 @@ int botan_x509_ext_ip_addr_blocks_get_family(botan_x509_cert_t cert,
 
 /**
 * Get info about a specific range in the extension
-* @param v4_count must the set to the number of v4 families present
+* @param v4_count must be set to the number of v4 families present
 * @param ipv6 must be set to 1 if the family is an IPv6 family, 0 for IPv4 families
 * @param i is the (local) index of the family, see `botan_x509_ext_ip_addr_blocks_get_family`
 * @param entry is the index of the range

src/python/botan3.py

@@ -2373,17 +2373,17 @@ def handle_(self):
         return self.__obj
 
     def ext_ip_addr_blocks(self) -> tuple[
-        list[tuple[int | None, list[tuple[list[int], list[int]]] | None]],
-        list[tuple[int | None, list[tuple[list[int], list[int]]] | None]]
+        list[tuple[int | None, list[tuple[tuple[int], tuple[int]]] | None]],
+        list[tuple[int | None, list[tuple[tuple[int], tuple[int]]] | None]]
     ]:
         """Get values from the IP Address Blocks extension.
         If the extension is not present, an exception will be raised.
 
-        Returns all values in the extension, in the form of (v4, v6), where both contain a tuple of
-        type (int | None, list[...]). The first element of the tuple is the SAFI, it may be `None`
+        Returns all values in the extension, in the form of (v4, v6), where both contain a list of tuples of
+        type (int | None, list[...]). The first element of each tuple is the SAFI, it may be `None`
         to indicate no SAFI is present. The second element is a list of elements of type
-        tuple[list[int], list[int]], where each element is a single address range. Each element contains
-        two lists of equal length, 4 for IPv4 families and 16 for IPv6 families. The values are the minimum
+        tuple[tuple[int], tuple[int]], where each element is a single address range. Each element contains
+        two tuples of equal length, 4 for IPv4 families and 16 for IPv6 families. The values are the minimum
         and maximum addresses of the range respectively. If the particular family is marked as "inherit",
         the outer tuple will contain `None` as its second element instead of a list of ranges."""
         v4 = []
@@ -2397,8 +2397,8 @@ def ext_ip_addr_blocks(self) -> tuple[
         v4_count = v4_count.value
         v6_count = v6_count.value
 
-        for (ipv6, count) in ((0, v4_count), (1, v6_count)):
-            for i in range(count):
+        for (ipv6, stop) in ((0, v4_count), (1, v6_count)):
+            for i in range(stop):
                 size = 16 if ipv6 else 4
 
                 has_safi = c_int(0)