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

Use of none botan private keys for signing certificates. #3867

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use of none botan private keys for signing certificates. #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/asn1/info.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ asn1_obj.h
der_enc.h
oids.h
ber_dec.h
pss_params.h
</header:public>

<header:internal>
oid_map.h
pss_params.h
</header:internal>
2 changes: 1 addition & 1 deletion src/lib/asn1/pss_params.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/

#include <botan/internal/pss_params.h>
#include <botan/pss_params.h>

#include <botan/ber_dec.h>
#include <botan/der_enc.h>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/asn1/pss_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace Botan {

class PSS_Params final : public ASN1_Object {
class BOTAN_PUBLIC_API(2, 0) PSS_Params final : public ASN1_Object {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be 3, 5 since 3.5 would be the first version where this was part of the public API

public:
static PSS_Params from_emsa_name(std::string_view emsa_name);

Expand Down
5 changes: 1 addition & 4 deletions src/lib/prov/pkcs11/info.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ pubkey
pk_pad
</requires>

<header:internal>
p11_mechanism.h
</header:internal>

<header:external>
pkcs11.h
pkcs11f.h
Expand All @@ -34,4 +30,5 @@ p11_randomgenerator.h
p11_rsa.h
p11_types.h
p11_x509.h
p11_mechanism.h
</header:public>
2 changes: 1 addition & 1 deletion src/lib/prov/pkcs11/p11_ecdh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <botan/der_enc.h>
#include <botan/pk_ops.h>
#include <botan/rng.h>
#include <botan/internal/p11_mechanism.h>
#include <botan/p11_mechanism.h>

namespace Botan::PKCS11 {

Expand Down
2 changes: 1 addition & 1 deletion src/lib/prov/pkcs11/p11_ecdsa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <botan/pk_ops.h>
#include <botan/rng.h>
#include <botan/internal/keypair.h>
#include <botan/internal/p11_mechanism.h>
#include <botan/p11_mechanism.h>

namespace Botan::PKCS11 {

Expand Down
2 changes: 1 addition & 1 deletion src/lib/prov/pkcs11/p11_mechanism.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/

#include <botan/internal/p11_mechanism.h>
#include <botan/p11_mechanism.h>

#include <botan/internal/fmt.h>
#include <botan/internal/parsing.h>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/prov/pkcs11/p11_mechanism.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Botan::PKCS11 {
* for RSA (encryption/decryption, signature/verification)
* and EC (ECDSA signature/verification, ECDH key derivation).
*/
class MechanismWrapper final {
class BOTAN_PUBLIC_API(2, 0) MechanismWrapper final {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise should be 3, 5

public:
/// @param mechanism_type the CK_MECHANISM_TYPE for the `mechanism` field of the CK_MECHANISM struct
explicit MechanismWrapper(MechanismType mechanism_type);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/prov/pkcs11/p11_rsa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <botan/pubkey.h>
#include <botan/rng.h>
#include <botan/internal/blinding.h>
#include <botan/internal/p11_mechanism.h>
#include <botan/p11_mechanism.h>
#include <botan/internal/pk_ops_impl.h>

namespace Botan::PKCS11 {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pubkey/pubkey.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <botan/mem_ops.h>
#include <botan/pk_ops.h>
#include <botan/rng.h>
#include <botan/pss_params.h>
#include <botan/internal/ct_utils.h>
#include <botan/internal/fmt.h>
#include <botan/internal/parsing.h>
#include <botan/internal/pss_params.h>

namespace Botan {

Expand Down
2 changes: 1 addition & 1 deletion src/lib/pubkey/rsa/rsa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <botan/ber_dec.h>
#include <botan/der_enc.h>
#include <botan/reducer.h>
#include <botan/pss_params.h>
#include <botan/internal/blinding.h>
#include <botan/internal/divide.h>
#include <botan/internal/emsa.h>
Expand All @@ -19,7 +20,6 @@
#include <botan/internal/monty_exp.h>
#include <botan/internal/parsing.h>
#include <botan/internal/pk_ops_impl.h>
#include <botan/internal/pss_params.h>
#include <botan/internal/workfactor.h>

#if defined(BOTAN_HAS_THREAD_UTILS)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tls/tls_signature_scheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <botan/hex.h>
#include <botan/tls_exceptn.h>
#include <botan/tls_version.h>
#include <botan/internal/pss_params.h>
#include <botan/pss_params.h>
#include <botan/internal/stl_util.h>

namespace Botan::TLS {
Expand Down