diff options
| author | unknown <kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se> | 2006-07-28 21:26:46 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se> | 2006-07-28 21:26:46 +0200 |
| commit | 8d73c0b392ba6b07284aa2dfad0495f7f9e4a794 (patch) | |
| tree | 390cf605f6b9fb4b8f4c85914fe9b6c55275da9a /extra | |
| parent | a7ba5b75a604ca7955fba507b5e457fb40a086a8 (diff) | |
| download | mariadb-git-8d73c0b392ba6b07284aa2dfad0495f7f9e4a794.tar.gz | |
sql_select.cc:
Renamed variable, to avoid name clash with macro "rem_size"
on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
Avoid name clash with NAME_MAX
sql/sql_select.cc:
Renamed variable, to avoid name clash with macro "rem_size"
on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
extra/yassl/taocrypt/src/asn.cpp:
Avoid name clash with NAME_MAX
extra/yassl/taocrypt/include/asn.hpp:
Avoid name clash with NAME_MAX
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/asn.hpp | 8 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/include/asn.hpp b/extra/yassl/taocrypt/include/asn.hpp index 90bc46a59fd..8bea2ae780b 100644 --- a/extra/yassl/taocrypt/include/asn.hpp +++ b/extra/yassl/taocrypt/include/asn.hpp @@ -103,7 +103,7 @@ enum Constants MAX_ALGO_SIZE = 9, MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4) DSA_SIG_SZ = 40, - NAME_MAX = 512 // max total of all included names + ASN_NAME_MAX = 512 // max total of all included names }; @@ -216,7 +216,7 @@ enum { SHA_SIZE = 20 }; // A Signing Authority class Signer { PublicKey key_; - char name_[NAME_MAX]; + char name_[ASN_NAME_MAX]; byte hash_[SHA_SIZE]; public: Signer(const byte* k, word32 kSz, const char* n, const byte* h); @@ -270,8 +270,8 @@ private: byte subjectHash_[SHA_SIZE]; // hash of all Names byte issuerHash_[SHA_SIZE]; // hash of all Names byte* signature_; - char issuer_[NAME_MAX]; // Names - char subject_[NAME_MAX]; // Names + char issuer_[ASN_NAME_MAX]; // Names + char subject_[ASN_NAME_MAX]; // Names char beforeDate_[MAX_DATE_SZ]; // valid before date char afterDate_[MAX_DATE_SZ]; // valid after date bool verify_; // Default to yes, but could be off diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index beb5490bb66..45fb1e60a0c 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -665,7 +665,7 @@ void CertDecoder::GetName(NameType nt) SHA sha; word32 length = GetSequence(); // length of all distinguished names - assert (length < NAME_MAX); + assert (length < ASN_NAME_MAX); length += source_.get_index(); char* ptr = (nt == ISSUER) ? issuer_ : subject_; |