Auto merge of #3404 - devnexen:linux_android_if_alg, r=JohnTitor

linux/android adding few if_alg.h constants. close #3329
rust-lang · Oct 25, 2023 · b292983 · b292983
2 parents 6314c9f + 5514e32
commit b292983
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -3862,6 +3862,9 @@ fn test_linux(target: &str) {
             // FIXME: Requires more recent kernel headers
             "HWTSTAMP_TX_ONESTEP_P2P" if musl => true, // linux v5.6+
 
+            // FIXME: Requires linux 6.1
+            "ALG_SET_KEY_BY_KEY_SERIAL" => true,
+
             _ => false,
         }
     });

diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -61,6 +61,7 @@ ALG_OP_DECRYPT
 ALG_OP_ENCRYPT
 ALG_SET_AEAD_ASSOCLEN
 ALG_SET_AEAD_AUTHSIZE
+ALG_SET_DRBG_ENTROPY
 ALG_SET_IV
 ALG_SET_KEY
 ALG_SET_OP

diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -71,8 +71,10 @@ ALG_OP_DECRYPT
 ALG_OP_ENCRYPT
 ALG_SET_AEAD_ASSOCLEN
 ALG_SET_AEAD_AUTHSIZE
+ALG_SET_DRBG_ENTROPY
 ALG_SET_IV
 ALG_SET_KEY
+ALG_SET_KEY_BY_KEY_SERIAL
 ALG_SET_OP
 ALT_DIGITS
 AM_STR

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -2745,6 +2745,7 @@ pub const ALG_SET_IV: ::c_int = 2;
 pub const ALG_SET_OP: ::c_int = 3;
 pub const ALG_SET_AEAD_ASSOCLEN: ::c_int = 4;
 pub const ALG_SET_AEAD_AUTHSIZE: ::c_int = 5;
+pub const ALG_SET_DRBG_ENTROPY: ::c_int = 6;
 
 pub const ALG_OP_DECRYPT: ::c_int = 0;
 pub const ALG_OP_ENCRYPT: ::c_int = 1;

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -3210,6 +3210,8 @@ pub const ALG_SET_IV: ::c_int = 2;
 pub const ALG_SET_OP: ::c_int = 3;
 pub const ALG_SET_AEAD_ASSOCLEN: ::c_int = 4;
 pub const ALG_SET_AEAD_AUTHSIZE: ::c_int = 5;
+pub const ALG_SET_DRBG_ENTROPY: ::c_int = 6;
+pub const ALG_SET_KEY_BY_KEY_SERIAL: ::c_int = 7;
 
 pub const ALG_OP_DECRYPT: ::c_int = 0;
 pub const ALG_OP_ENCRYPT: ::c_int = 1;