feat: add bindings for riscv64gc-unknown-linux-gnu target by NeilHanlon · Pull Request #212 · parallaxsecond/rust-cryptoki

NeilHanlon · 2024-07-30T14:26:41Z

This change adds riscv64gc-unknown-linux-gnu bindings for cryptoki-sys
crate and adds the target to ci.sh and regenerate_bindings.sh for future
updates. This change will enable building the package for risvc in
Fedora.

n.b., in order to build locally I disabled the unused_qualifications lint due to the following:

error: unnecessary qualification
   --> cryptoki/src/mechanism/mod.rs:979:33
    |
979 |                 ulParameterLen: std::mem::size_of::<CK_GCM_PARAMS>()
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
note: the lint level is defined here
   --> cryptoki/src/lib.rs:51:8
    |
51  |        unused_qualifications,
    |        ^^^^^^^^^^^^^^^^^^^^^
help: remove the unnecessary path segments
    |
979 -                 ulParameterLen: std::mem::size_of::<CK_GCM_PARAMS>()
979 +                 ulParameterLen: size_of::<CK_GCM_PARAMS>()
    |

error: unnecessary qualification
    --> cryptoki/src/mechanism/mod.rs:1042:25
     |
1042 |         ulParameterLen: std::mem::size_of::<T>()
     |                         ^^^^^^^^^^^^^^^^^^^^^^
     |
help: remove the unnecessary path segments
     |
1042 -         ulParameterLen: std::mem::size_of::<T>()
1042 +         ulParameterLen: size_of::<T>()
     |

error: unnecessary qualification
   --> cryptoki/src/object.rs:620:48
    |
620 |             | Attribute::WrapWithTrusted(_) => std::mem::size_of::<bool>(),
    |                                                ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
620 -             | Attribute::WrapWithTrusted(_) => std::mem::size_of::<bool>(),
620 +             | Attribute::WrapWithTrusted(_) => size_of::<bool>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:623:17
    |
623 |                 std::mem::size_of::<CK_UTF8CHAR>() * bytes.len()
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
623 -                 std::mem::size_of::<CK_UTF8CHAR>() * bytes.len()
623 +                 size_of::<CK_UTF8CHAR>() * bytes.len()
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:627:46
    |
627 |             Attribute::CertificateType(_) => std::mem::size_of::<CK_CERTIFICATE_TYPE>(),
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
627 -             Attribute::CertificateType(_) => std::mem::size_of::<CK_CERTIFICATE_TYPE>(),
627 +             Attribute::CertificateType(_) => size_of::<CK_CERTIFICATE_TYPE>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:629:36
    |
629 |             Attribute::Class(_) => std::mem::size_of::<CK_OBJECT_CLASS>(),
    |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
629 -             Attribute::Class(_) => std::mem::size_of::<CK_OBJECT_CLASS>(),
629 +             Attribute::Class(_) => size_of::<CK_OBJECT_CLASS>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:639:46
    |
639 |             Attribute::KeyGenMechanism(_) => std::mem::size_of::<CK_MECHANISM_TYPE>(),
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
639 -             Attribute::KeyGenMechanism(_) => std::mem::size_of::<CK_MECHANISM_TYPE>(),
639 +             Attribute::KeyGenMechanism(_) => size_of::<CK_MECHANISM_TYPE>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:640:38
    |
640 |             Attribute::KeyType(_) => std::mem::size_of::<CK_KEY_TYPE>(),
    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
640 -             Attribute::KeyType(_) => std::mem::size_of::<CK_KEY_TYPE>(),
640 +             Attribute::KeyType(_) => size_of::<CK_KEY_TYPE>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:642:42
    |
642 |             Attribute::ModulusBits(_) => std::mem::size_of::<CK_ULONG>(),
    |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
642 -             Attribute::ModulusBits(_) => std::mem::size_of::<CK_ULONG>(),
642 +             Attribute::ModulusBits(_) => size_of::<CK_ULONG>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:654:39
    |
654 |             Attribute::ValueLen(_) => std::mem::size_of::<CK_ULONG>(),
    |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
654 -             Attribute::ValueLen(_) => std::mem::size_of::<CK_ULONG>(),
654 +             Attribute::ValueLen(_) => size_of::<CK_ULONG>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:655:64
    |
655 |             Attribute::EndDate(_) | Attribute::StartDate(_) => std::mem::size_of::<CK_DATE>(),
    |                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
655 -             Attribute::EndDate(_) | Attribute::StartDate(_) => std::mem::size_of::<CK_DATE>(),
655 +             Attribute::EndDate(_) | Attribute::StartDate(_) => size_of::<CK_DATE>(),
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:658:17
    |
658 |                 std::mem::size_of::<CK_MECHANISM_TYPE>() * mechanisms.len()
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
658 -                 std::mem::size_of::<CK_MECHANISM_TYPE>() * mechanisms.len()
658 +                 size_of::<CK_MECHANISM_TYPE>() * mechanisms.len()
    |

error: unnecessary qualification
   --> cryptoki/src/object.rs:770:24
    |
770 |     let as_array: [u8; std::mem::size_of::<CK_BBOOL>()] = slice.try_into()?;
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
help: remove the unnecessary path segments
    |
770 -     let as_array: [u8; std::mem::size_of::<CK_BBOOL>()] = slice.try_into()?;
770 +     let as_array: [u8; size_of::<CK_BBOOL>()] = slice.try_into()?;
    |

error: could not compile `cryptoki` (lib) due to 13 previous errors

If this change is not preferred or required, I can drop the hunk from the PR.

wiktor-k · 2024-08-30T11:59:16Z

I think this looks good. The lint you had to disabled should be accounted for in main so if you could rebase we'd proceed with this one.

Sorry for the delay - I guess it's holiday season 😅

ionut-arm · 2024-09-08T19:33:11Z

I'm happy with the patch, but as @wiktor-k says, would be good to rebase and re-enable the lint. Apologies for the long delay 🥲

NeilHanlon · 2024-09-08T22:07:37Z

All set. Sorry for the delay, and thank you!

hug-dev · 2024-09-13T09:22:36Z

I am wondering if you are missing adding the target in the GitHub workflow files (in .github). Compare with PRs doing similar changes for example #166 and #190. The CI might pass after that?

This change adds riscv64gc-unknown-linux-gnu bindings for cryptoki-sys crate and adds the target to ci.sh and regenerate_bindings.sh for future updates. This change will enable building the package for risvc in Fedora. Signed-off-by: Neil Hanlon <neil@shrug.pw>

hug-dev

If my suggestion is correct, you only need to rebase and the CI should pass 🙏

hug-dev · 2024-12-22T17:02:46Z

cryptoki-sys/src/lib.rs


+#[cfg(all(
+    not(feature = "generate-bindings"),
+    target_arch = "riscv64gc",


Suggested change

target_arch = "riscv64gc",

target_arch = "riscv64",

hug-dev · 2025-03-27T10:38:32Z

I think I managed to make it work in #251 !

hug-dev · 2025-03-27T10:51:25Z

Done in #251!

NeilHanlon force-pushed the main branch from 2191fd5 to e85b1bd Compare July 30, 2024 14:29

wiktor-k requested review from hug-dev and ionut-arm September 6, 2024 09:24

NeilHanlon force-pushed the main branch 2 times, most recently from 0f0e77d to 348eedf Compare September 8, 2024 22:07

NeilHanlon force-pushed the main branch from 348eedf to 0b6104a Compare December 14, 2024 17:39

hug-dev approved these changes Dec 22, 2024

View reviewed changes

hug-dev mentioned this pull request Mar 27, 2025

feat: add bindings for riscv64gc-unknown-linux-gnu target #251

Merged

hug-dev closed this Mar 27, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add bindings for riscv64gc-unknown-linux-gnu target#212

feat: add bindings for riscv64gc-unknown-linux-gnu target#212
NeilHanlon wants to merge 1 commit intoparallaxsecond:mainfrom
neil-forks:main

NeilHanlon commented Jul 30, 2024

Uh oh!

wiktor-k commented Aug 30, 2024

Uh oh!

ionut-arm commented Sep 8, 2024

Uh oh!

NeilHanlon commented Sep 8, 2024

Uh oh!

hug-dev commented Sep 13, 2024

Uh oh!

hug-dev left a comment

Uh oh!

hug-dev Dec 22, 2024

Uh oh!

hug-dev commented Mar 27, 2025

Uh oh!

hug-dev commented Mar 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

NeilHanlon commented Jul 30, 2024

Uh oh!

wiktor-k commented Aug 30, 2024

Uh oh!

ionut-arm commented Sep 8, 2024

Uh oh!

NeilHanlon commented Sep 8, 2024

Uh oh!

hug-dev commented Sep 13, 2024

Uh oh!

hug-dev left a comment

Choose a reason for hiding this comment

Uh oh!

hug-dev Dec 22, 2024

Choose a reason for hiding this comment

Uh oh!

hug-dev commented Mar 27, 2025

Uh oh!

hug-dev commented Mar 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants