Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: fix name of crypto_aes library #397

Merged
merged 1 commit into from
Jan 31, 2025
Merged

build: fix name of crypto_aes library #397

merged 1 commit into from
Jan 31, 2025

Conversation

gperciva
Copy link
Member

No description provided.

@gperciva gperciva force-pushed the fix-crypto-aes-name branch from 4620c8f to 74509bd Compare January 30, 2025 17:27
@gperciva
Copy link
Member Author

gperciva commented Jan 30, 2025 •
edited
Loading

We made a mistake in #386 -- this library only includes libcperciva code, not scrypt, so it should be libcperciva_*.

@gperciva gperciva force-pushed the fix-crypto-aes-name branch from 74509bd to 2e065bf Compare January 30, 2025 17:30
@gperciva gperciva mentioned this pull request Jan 30, 2025
Merged
@gperciva gperciva marked this pull request as draft January 31, 2025 20:49
@gperciva gperciva force-pushed the fix-crypto-aes-name branch from e912c35 to b21b7aa Compare January 31, 2025 21:04
@gperciva
Makefile.am: fix name & style for crypto_aes.a
b21b7aa 
This should have been part of:
    2024-04-08 apisupport: add & use LIBCRYPTO-LOW_LEVEL_AES
    329439f

This library only uses libcperciva code, so it should be libcperciva_*,
not libscrypt_*.

Also, we don't crypto_aes.h in _SOURCES.  And we want to recompile this
if cpusupport-config.h was modified.
@gperciva
Copy link
Member Author

I think this one is ready to go. (The "sorting library order" PR still needs work.)

This does:

  • change name
  • remove crypto_aes.h from _SOURCES
  • add dependency on cpusupport-config.h

This library's CFLAGS does not include cpusupport-config.h compiler flags (unlike all the other libcperciva libraries for scrypt), but that checks out -- we don't need anything like -maes to compile this file. We do need defines such as CPUSUPPORT_X86_AESNI to compile it correctly, but those come from the #include "cpusupport.h".

@gperciva gperciva marked this pull request as ready for review January 31, 2025 21:08
@cperciva cperciva merged commit 1c684dc into master Jan 31, 2025
2 checks passed
@gperciva gperciva deleted the fix-crypto-aes-name branch January 31, 2025 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gperciva @cperciva