wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-05 13:30:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10664 from JacobBarthelmeh/nightly

Browse Source 
the examples pem.c --padding flag does not need gated behind WOLFSSL_DER_TO_PEM
This commit is contained in:
David Garske
2026-06-12 10:55:49 -07:00
committed by GitHub
parent 6081106ae3 d9ca55e5c0
commit fb80740738
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/pem/pem.c
+6 -6
View File
@@ -657,11 +657,11 @@ const char* usage[] = {
" -o --offset offset into file where data to convert starts",
#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_PWDBASED)
" -p --pass password to use with encrypted keys",
" --padding Remove padding on decrypted data",
#endif
#ifdef WOLFSSL_DER_TO_PEM
" -d --der input is DER and output is PEM",
#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_PWDBASED)
" --padding Remove padding on decrypted data",
" -e --encrypt DER key is to be encrypted",
" -v --pbe-ver PBE version to use when encrypting key (see below)",
" -p --pbe PBE to use when encrypting key (see below)",
@@ -839,7 +839,11 @@ int main(int argc, char* argv[])
info.passwd_cb = password_from_userdata;
info.passwd_userdata = argv[0];
}
#endif
/* Remove padding leftover from decryption. */
else if (strcmp(argv[0], "--padding") == 0) {
padding = 1;
}
#endif /* WOLFSSL_ENCRYPTED_KEYS && !NO_PWDBASED */
#ifdef WOLFSSL_DER_TO_PEM
/* Input is DER and we are converting to PEM. */
else if ((strcmp(argv[0], "-d") == 0) ||
@@ -847,10 +851,6 @@ int main(int argc, char* argv[])
pem = 0;
}
#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_PWDBASED)
/* Remove padding leftover from decryption. */
else if (strcmp(argv[0], "--padding") == 0) {
padding = 1;
}
/* Encrypting the DER data. */
else if ((strcmp(argv[0], "-e") == 0) ||
(strcmp(argv[0], "--encrypt") == 0)) {