Skip to content

Commit d2aefa9

Browse files
committed
remove underscores from padding context names
1 parent 800a891 commit d2aefa9

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/cryptography/hazmat/bindings/_rust/__init__.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class PKCS7PaddingContext(padding.PaddingContext):
1313
def update(self, data: bytes) -> bytes: ...
1414
def finalize(self) -> bytes: ...
1515

16-
class _ANSIX923PaddingContext(padding.PaddingContext):
16+
class ANSIX923PaddingContext(padding.PaddingContext):
1717
def __init__(self, block_size: int) -> None: ...
1818
def update(self, data: bytes) -> bytes: ...
1919
def finalize(self) -> bytes: ...
@@ -23,7 +23,7 @@ class PKCS7UnpaddingContext(padding.PaddingContext):
2323
def update(self, data: bytes) -> bytes: ...
2424
def finalize(self) -> bytes: ...
2525

26-
class _ANSIX923UnpaddingContext(padding.PaddingContext):
26+
class ANSIX923UnpaddingContext(padding.PaddingContext):
2727
def __init__(self, block_size: int) -> None: ...
2828
def update(self, data: bytes) -> bytes: ...
2929
def finalize(self) -> bytes: ...

src/cryptography/hazmat/primitives/padding.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import abc
88

99
from cryptography.hazmat.bindings._rust import (
10+
ANSIX923PaddingContext,
11+
ANSIX923UnpaddingContext,
1012
PKCS7PaddingContext,
1113
PKCS7UnpaddingContext,
12-
_ANSIX923PaddingContext,
13-
_ANSIX923UnpaddingContext,
1414
)
1515

1616

@@ -58,11 +58,11 @@ def __init__(self, block_size: int):
5858
self.block_size = block_size
5959

6060
def padder(self) -> PaddingContext:
61-
return _ANSIX923PaddingContext(self.block_size)
61+
return ANSIX923PaddingContext(self.block_size)
6262

6363
def unpadder(self) -> PaddingContext:
64-
return _ANSIX923UnpaddingContext(self.block_size)
64+
return ANSIX923UnpaddingContext(self.block_size)
6565

6666

67-
PaddingContext.register(_ANSIX923PaddingContext)
68-
PaddingContext.register(_ANSIX923UnpaddingContext)
67+
PaddingContext.register(ANSIX923PaddingContext)
68+
PaddingContext.register(ANSIX923UnpaddingContext)

src/rust/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ mod _rust {
106106
use crate::oid::ObjectIdentifier;
107107
#[pymodule_export]
108108
use crate::padding::{
109-
check_ansix923_padding, PKCS7PaddingContext, PKCS7UnpaddingContext,
110-
_ANSIX923PaddingContext, _ANSIX923UnpaddingContext,
109+
check_ansix923_padding, ANSIX923PaddingContext, ANSIX923UnpaddingContext,
110+
PKCS7PaddingContext, PKCS7UnpaddingContext,
111111
};
112112
#[pymodule_export]
113113
use crate::pkcs12::pkcs12;

src/rust/src/padding.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ impl PKCS7PaddingContext {
111111
}
112112

113113
#[pyo3::pyclass]
114-
pub(crate) struct _ANSIX923PaddingContext {
114+
pub(crate) struct ANSIX923PaddingContext {
115115
block_size: usize,
116116
buffer: Option<Vec<u8>>,
117117
}
118118

119119
#[pyo3::pymethods]
120-
impl _ANSIX923PaddingContext {
120+
impl ANSIX923PaddingContext {
121121
#[new]
122-
pub(crate) fn new(block_size: usize) -> _ANSIX923PaddingContext {
123-
_ANSIX923PaddingContext {
122+
pub(crate) fn new(block_size: usize) -> ANSIX923PaddingContext {
123+
ANSIX923PaddingContext {
124124
block_size: block_size / 8,
125125
buffer: Some(Vec::new()),
126126
}
@@ -226,16 +226,16 @@ impl PKCS7UnpaddingContext {
226226
}
227227

228228
#[pyo3::pyclass]
229-
pub(crate) struct _ANSIX923UnpaddingContext {
229+
pub(crate) struct ANSIX923UnpaddingContext {
230230
block_size: usize,
231231
buffer: Option<Vec<u8>>,
232232
}
233233

234234
#[pyo3::pymethods]
235-
impl _ANSIX923UnpaddingContext {
235+
impl ANSIX923UnpaddingContext {
236236
#[new]
237-
pub(crate) fn new(block_size: usize) -> _ANSIX923UnpaddingContext {
238-
_ANSIX923UnpaddingContext {
237+
pub(crate) fn new(block_size: usize) -> ANSIX923UnpaddingContext {
238+
ANSIX923UnpaddingContext {
239239
block_size: block_size / 8,
240240
buffer: Some(Vec::new()),
241241
}

0 commit comments

Comments
 (0)