Skip to content

Commit b292983

Browse files
committed
Auto merge of #3404 - devnexen:linux_android_if_alg, r=JohnTitor
linux/android adding few if_alg.h constants. close #3329
2 parents 6314c9f + 5514e32 commit b292983

File tree

5 files changed

+9
-0
lines changed

5 files changed

+9
-0
lines changed

libc-test/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3862,6 +3862,9 @@ fn test_linux(target: &str) {
38623862
// FIXME: Requires more recent kernel headers
38633863
"HWTSTAMP_TX_ONESTEP_P2P" if musl => true, // linux v5.6+
38643864

3865+
// FIXME: Requires linux 6.1
3866+
"ALG_SET_KEY_BY_KEY_SERIAL" => true,
3867+
38653868
_ => false,
38663869
}
38673870
});

libc-test/semver/android.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ ALG_OP_DECRYPT
6161
ALG_OP_ENCRYPT
6262
ALG_SET_AEAD_ASSOCLEN
6363
ALG_SET_AEAD_AUTHSIZE
64+
ALG_SET_DRBG_ENTROPY
6465
ALG_SET_IV
6566
ALG_SET_KEY
6667
ALG_SET_OP

libc-test/semver/linux.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ ALG_OP_DECRYPT
7171
ALG_OP_ENCRYPT
7272
ALG_SET_AEAD_ASSOCLEN
7373
ALG_SET_AEAD_AUTHSIZE
74+
ALG_SET_DRBG_ENTROPY
7475
ALG_SET_IV
7576
ALG_SET_KEY
77+
ALG_SET_KEY_BY_KEY_SERIAL
7678
ALG_SET_OP
7779
ALT_DIGITS
7880
AM_STR

src/unix/linux_like/android/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2745,6 +2745,7 @@ pub const ALG_SET_IV: ::c_int = 2;
27452745
pub const ALG_SET_OP: ::c_int = 3;
27462746
pub const ALG_SET_AEAD_ASSOCLEN: ::c_int = 4;
27472747
pub const ALG_SET_AEAD_AUTHSIZE: ::c_int = 5;
2748+
pub const ALG_SET_DRBG_ENTROPY: ::c_int = 6;
27482749

27492750
pub const ALG_OP_DECRYPT: ::c_int = 0;
27502751
pub const ALG_OP_ENCRYPT: ::c_int = 1;

src/unix/linux_like/linux/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3210,6 +3210,8 @@ pub const ALG_SET_IV: ::c_int = 2;
32103210
pub const ALG_SET_OP: ::c_int = 3;
32113211
pub const ALG_SET_AEAD_ASSOCLEN: ::c_int = 4;
32123212
pub const ALG_SET_AEAD_AUTHSIZE: ::c_int = 5;
3213+
pub const ALG_SET_DRBG_ENTROPY: ::c_int = 6;
3214+
pub const ALG_SET_KEY_BY_KEY_SERIAL: ::c_int = 7;
32133215

32143216
pub const ALG_OP_DECRYPT: ::c_int = 0;
32153217
pub const ALG_OP_ENCRYPT: ::c_int = 1;

0 commit comments

Comments
 (0)