aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2026-06-30 18:56:30 +0200
committerDimitri Staessens <dimitri@ouroboros.rocks>2026-06-30 19:11:22 +0200
commitde7b087e8affc5ea987a6505eb9d6738f38e87db (patch)
tree0338d056b8160a7339ad8ed7f3878e005b1a02d3
parenta84480ad168bbc29d7f5bcc5b6a478ffedace6e7 (diff)
downloadpyouroboros-de7b087e8affc5ea987a6505eb9d6738f38e87db.tar.gz
pyouroboros-de7b087e8affc5ea987a6505eb9d6738f38e87db.zip
ouroboros: Rename enc->sec paths
Ouroboros renamed 'enc' to 'sec' in name.h.
-rw-r--r--ffi/pyouroboros_build_irm.py2
-rw-r--r--ouroboros/irm.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/ffi/pyouroboros_build_irm.py b/ffi/pyouroboros_build_irm.py
index 70056b1..1773788 100644
--- a/ffi/pyouroboros_build_irm.py
+++ b/ffi/pyouroboros_build_irm.py
@@ -201,7 +201,7 @@ enum pol_balance {
};
struct name_sec_paths {
- char enc[512]; /* NAME_PATH_SIZE + 1 */
+ char sec[512]; /* NAME_PATH_SIZE + 1 */
char key[512]; /* NAME_PATH_SIZE + 1 */
char crt[512]; /* NAME_PATH_SIZE + 1 */
};
diff --git a/ouroboros/irm.py b/ouroboros/irm.py
index c8803ce..34a65fb 100644
--- a/ouroboros/irm.py
+++ b/ouroboros/irm.py
@@ -211,8 +211,8 @@ class IpcpConfig:
@dataclass
class NameSecPaths:
- """Security paths for a name (encryption, key, certificate)."""
- enc: str = ""
+ """Security paths for a name (security config, key, certificate)."""
+ sec: str = ""
key: str = ""
crt: str = ""
@@ -303,7 +303,7 @@ def _name_info_to_c(info: NameInfo):
for attr, sec in (('s', info.server_sec), ('c', info.client_sec)):
sec_paths = getattr(_info, attr)
- for fld in ('enc', 'key', 'crt'):
+ for fld in ('sec', 'key', 'crt'):
val = getattr(sec, fld).encode()
ffi.memmove(getattr(sec_paths, fld), val,
min(len(val), 511))
@@ -512,12 +512,12 @@ def list_names() -> List[NameInfo]:
name=ffi.string(info.name).decode(),
pol_lb=LoadBalancePolicy(info.pol_lb),
server_sec=NameSecPaths(
- enc=ffi.string(info.s.enc).decode(),
+ sec=ffi.string(info.s.sec).decode(),
key=ffi.string(info.s.key).decode(),
crt=ffi.string(info.s.crt).decode(),
),
client_sec=NameSecPaths(
- enc=ffi.string(info.c.enc).decode(),
+ sec=ffi.string(info.c.sec).decode(),
key=ffi.string(info.c.key).decode(),
crt=ffi.string(info.c.crt).decode(),
),