Skip to content

Commit 5032d59

Browse files
prince-chrismcprince-chrismc
authored
🧹 Removing extra exception aliases (#257)
* remove exception outside of error namespace * linter
1 parent 95b3dbf commit 5032d59

File tree

7 files changed

+92
-95
lines changed

7 files changed

+92
-95
lines changed

‎include/jwt-cpp/jwt.h

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -362,15 +362,8 @@ namespace jwt {
362362
}
363363
}
364364
} // namespace error
365-
366-
// FIXME: Remove
367-
// Keep backward compat at least for a couple of revisions
368-
using error::ecdsa_exception;
369-
using error::rsa_exception;
370-
using error::signature_generation_exception;
371-
using error::signature_verification_exception;
372-
using error::token_verification_exception;
373365
} // namespace jwt
366+
374367
namespace std {
375368
template<>
376369
struct is_error_code_enum<jwt::error::rsa_error> : true_type {};
@@ -383,6 +376,7 @@ namespace std {
383376
template<>
384377
struct is_error_code_enum<jwt::error::token_verification_error> : true_type {};
385378
} // namespace std
379+
386380
namespace jwt {
387381
/**
388382
* \brief A collection for working with certificates
@@ -974,7 +968,7 @@ namespace jwt {
974968
} else if (!public_key.empty()) {
975969
pkey = helper::load_public_key_from_string(public_key, public_key_password);
976970
} else
977-
throw rsa_exception(error::rsa_error::no_key_provided);
971+
throw error::rsa_exception(error::rsa_error::no_key_provided);
978972
}
979973
/**
980974
* Sign jwt data
@@ -1084,13 +1078,13 @@ namespace jwt {
10841078
pkey = helper::load_public_ec_key_from_string(public_key, public_key_password);
10851079
check_public_key(pkey.get());
10861080
} else {
1087-
throw ecdsa_exception(error::ecdsa_error::no_key_provided);
1081+
throw error::ecdsa_exception(error::ecdsa_error::no_key_provided);
10881082
}
1089-
if (!pkey) throw ecdsa_exception(error::ecdsa_error::invalid_key);
1083+
if (!pkey) throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
10901084

10911085
size_t keysize = EVP_PKEY_bits(pkey.get());
10921086
if (keysize != signature_length * 4 && (signature_length != 132 || keysize != 521))
1093-
throw ecdsa_exception(error::ecdsa_error::invalid_key_size);
1087+
throw error::ecdsa_exception(error::ecdsa_error::invalid_key_size);
10941088
}
10951089

10961090
/**
@@ -1190,25 +1184,29 @@ namespace jwt {
11901184
#ifdef JWT_OPENSSL_3_0
11911185
std::unique_ptr<EVP_PKEY_CTX, decltype(&EVP_PKEY_CTX_free)> ctx(
11921186
EVP_PKEY_CTX_new_from_pkey(nullptr, pkey, nullptr), EVP_PKEY_CTX_free);
1193-
if (!ctx) { throw ecdsa_exception(error::ecdsa_error::create_context_failed); }
1194-
if (EVP_PKEY_public_check(ctx.get()) != 1) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
1187+
if (!ctx) { throw error::ecdsa_exception(error::ecdsa_error::create_context_failed); }
1188+
if (EVP_PKEY_public_check(ctx.get()) != 1) {
1189+
throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
1190+
}
11951191
#else
11961192
std::unique_ptr<EC_KEY, decltype(&EC_KEY_free)> eckey(EVP_PKEY_get1_EC_KEY(pkey), EC_KEY_free);
1197-
if (!eckey) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
1198-
if (EC_KEY_check_key(eckey.get()) == 0) throw ecdsa_exception(error::ecdsa_error::invalid_key);
1193+
if (!eckey) { throw error::ecdsa_exception(error::ecdsa_error::invalid_key); }
1194+
if (EC_KEY_check_key(eckey.get()) == 0) throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
11991195
#endif
12001196
}
12011197

12021198
static void check_private_key(EVP_PKEY* pkey) {
12031199
#ifdef JWT_OPENSSL_3_0
12041200
std::unique_ptr<EVP_PKEY_CTX, decltype(&EVP_PKEY_CTX_free)> ctx(
12051201
EVP_PKEY_CTX_new_from_pkey(nullptr, pkey, nullptr), EVP_PKEY_CTX_free);
1206-
if (!ctx) { throw ecdsa_exception(error::ecdsa_error::create_context_failed); }
1207-
if (EVP_PKEY_private_check(ctx.get()) != 1) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
1202+
if (!ctx) { throw error::ecdsa_exception(error::ecdsa_error::create_context_failed); }
1203+
if (EVP_PKEY_private_check(ctx.get()) != 1) {
1204+
throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
1205+
}
12081206
#else
12091207
std::unique_ptr<EC_KEY, decltype(&EC_KEY_free)> eckey(EVP_PKEY_get1_EC_KEY(pkey), EC_KEY_free);
1210-
if (!eckey) { throw ecdsa_exception(error::ecdsa_error::invalid_key); }
1211-
if (EC_KEY_check_key(eckey.get()) == 0) throw ecdsa_exception(error::ecdsa_error::invalid_key);
1208+
if (!eckey) { throw error::ecdsa_exception(error::ecdsa_error::invalid_key); }
1209+
if (EC_KEY_check_key(eckey.get()) == 0) throw error::ecdsa_exception(error::ecdsa_error::invalid_key);
12121210
#endif
12131211
}
12141212

@@ -1314,7 +1312,7 @@ namespace jwt {
13141312
} else if (!public_key.empty()) {
13151313
pkey = helper::load_public_key_from_string(public_key, public_key_password);
13161314
} else
1317-
throw ecdsa_exception(error::ecdsa_error::load_key_bio_read);
1315+
throw error::ecdsa_exception(error::ecdsa_error::load_key_bio_read);
13181316
}
13191317
/**
13201318
* Sign jwt data
@@ -1449,7 +1447,7 @@ namespace jwt {
14491447
} else if (!public_key.empty()) {
14501448
pkey = helper::load_public_key_from_string(public_key, public_key_password);
14511449
} else
1452-
throw rsa_exception(error::rsa_error::no_key_provided);
1450+
throw error::rsa_exception(error::rsa_error::no_key_provided);
14531451
}
14541452

14551453
/**

‎tests/OpenSSLErrorTest.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ TEST(OpenSSLErrorTest, ExtractPubkeyFromCert) {
490490
try {
491491
jwt::helper::extract_pubkey_from_cert(sample_cert, "");
492492
FAIL(); // Should never reach this
493-
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
493+
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
494494
});
495495
}
496496

@@ -516,7 +516,7 @@ TEST(OpenSSLErrorTest, ConvertCertBase64DerToPem) {
516516
try {
517517
jwt::helper::convert_base64_der_to_pem(sample_cert_base64_der);
518518
FAIL(); // Should never reach this
519-
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
519+
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
520520
});
521521
}
522522

@@ -545,7 +545,7 @@ TEST(OpenSSLErrorTest, LoadPublicKeyFromString) {
545545
try {
546546
jwt::helper::load_public_key_from_string(rsa_pub_key, "");
547547
FAIL(); // Should never reach this
548-
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
548+
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
549549
});
550550
}
551551

@@ -582,7 +582,7 @@ TEST(OpenSSLErrorTest, LoadPublicKeyCertFromString) {
582582
try {
583583
jwt::helper::load_public_key_from_string(sample_cert, "");
584584
FAIL(); // Should never reach this
585-
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
585+
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
586586
});
587587
}
588588

@@ -619,7 +619,7 @@ TEST(OpenSSLErrorTest, LoadPrivateKeyFromString) {
619619
try {
620620
jwt::helper::load_private_key_from_string(rsa_priv_key, "");
621621
FAIL(); // Should never reach this
622-
} catch (const jwt::rsa_exception& e) { ec = e.code(); }
622+
} catch (const jwt::error::rsa_exception& e) { ec = e.code(); }
623623
});
624624
}
625625

0 commit comments

Comments
 (0)