Skip to content

Commit 891de46

Browse files
committed
fix!: increase ChangeError len values to u32
BREAKING CHANGE.
1 parent 9d54cd0 commit 891de46

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

cktap-ffi/src/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ pub enum ChangeError {
345345
err: CkTapError,
346346
},
347347
#[error("new cvc is too short, must be at least 6 bytes, was only {len} bytes")]
348-
TooShort { len: u8 },
348+
TooShort { len: u32 },
349349
#[error("new cvc is too long, must be at most 32 bytes, was {len} bytes")]
350-
TooLong { len: u8 },
350+
TooLong { len: u32 },
351351
#[error("new cvc is the same as the old one")]
352352
SameAsOld,
353353
}

cktap-swift/Sources/CKTap/cktap_ffi.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,9 +2019,9 @@ enum ChangeError: Swift.Error, Equatable, Hashable, Foundation.LocalizedError {
20192019

20202020
case CkTap(err: CkTapError
20212021
)
2022-
case TooShort(len: UInt8
2022+
case TooShort(len: UInt32
20232023
)
2024-
case TooLong(len: UInt8
2024+
case TooLong(len: UInt32
20252025
)
20262026
case SameAsOld
20272027

@@ -2057,10 +2057,10 @@ public struct FfiConverterTypeChangeError: FfiConverterRustBuffer {
20572057
err: try FfiConverterTypeCkTapError.read(from: &buf)
20582058
)
20592059
case 2: return .TooShort(
2060-
len: try FfiConverterUInt8.read(from: &buf)
2060+
len: try FfiConverterUInt32.read(from: &buf)
20612061
)
20622062
case 3: return .TooLong(
2063-
len: try FfiConverterUInt8.read(from: &buf)
2063+
len: try FfiConverterUInt32.read(from: &buf)
20642064
)
20652065
case 4: return .SameAsOld
20662066

@@ -2082,12 +2082,12 @@ public struct FfiConverterTypeChangeError: FfiConverterRustBuffer {
20822082

20832083
case let .TooShort(len):
20842084
writeInt(&buf, Int32(2))
2085-
FfiConverterUInt8.write(len, into: &buf)
2085+
FfiConverterUInt32.write(len, into: &buf)
20862086

20872087

20882088
case let .TooLong(len):
20892089
writeInt(&buf, Int32(3))
2090-
FfiConverterUInt8.write(len, into: &buf)
2090+
FfiConverterUInt32.write(len, into: &buf)
20912091

20922092

20932093
case .SameAsOld:

lib/src/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ pub enum ChangeError {
131131
#[error(transparent)]
132132
CkTap(#[from] CkTapError),
133133
#[error("new cvc is too short, must be at least 6 bytes, was only {0} bytes")]
134-
TooShort(u8),
134+
TooShort(u32),
135135
#[error("new cvc is too long, must be at most 32 bytes, was {0} bytes")]
136-
TooLong(u8),
136+
TooLong(u32),
137137
#[error("new cvc is the same as the old one")]
138138
SameAsOld,
139139
}

lib/src/tap_signer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ pub trait TapSignerShared: Authentication {
286286
/// Change the CVC used for card authentication to a new user provided one
287287
async fn change(&mut self, new_cvc: &str, cvc: &str) -> Result<(), ChangeError> {
288288
if new_cvc.len() < 6 {
289-
return Err(ChangeError::TooShort(new_cvc.len() as u8));
289+
return Err(ChangeError::TooShort(new_cvc.len() as u32));
290290
}
291291

292292
if new_cvc.len() > 32 {
293-
return Err(ChangeError::TooLong(new_cvc.len() as u8));
293+
return Err(ChangeError::TooLong(new_cvc.len() as u32));
294294
}
295295

296296
if new_cvc == cvc {

0 commit comments

Comments
 (0)