aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2007-07-27 22:50:07 +0000
committerlloyd <[email protected]>2007-07-27 22:50:07 +0000
commit4b05d9cf96dbda148e692e49e326796fa022254f (patch)
treef59d363315dee97132235cf6fda4b1d60df3a4b5
parent68a0f2fad07192a98369226216adee57ce0579b3 (diff)
parentb003b1c2f2fd53c2acc214623f2f0e0399ab02a8 (diff)
propagate from branch 'net.randombit.botan.stable' (head b8139f65cc60ecf9c4b2e789474f81d97036f43e)
to branch 'net.randombit.botan' (head 257e32039477e27e354f0cebf2f139fcd9f7400a)
-rw-r--r--doc/logs/log-16.txt4
-rw-r--r--src/x509stat.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/logs/log-16.txt b/doc/logs/log-16.txt
index 3ba830480..caaea8b66 100644
--- a/doc/logs/log-16.txt
+++ b/doc/logs/log-16.txt
@@ -1,4 +1,8 @@
+* 1.6.3, July 23, 2007
+ - Fix a race condition in the algorithm lookup cache
+ - Fix problems building the memory pool on some versions of Visual C++
+
* 1.6.2, March 24, 2007
- Fix autodection on Athlon64s running Linux
- Fix builds on QNX and compilers using STLport
diff --git a/src/x509stat.cpp b/src/x509stat.cpp
index fbf0266b0..45b858c02 100644
--- a/src/x509stat.cpp
+++ b/src/x509stat.cpp
@@ -41,8 +41,8 @@ X509_GlobalState::X509_GlobalState()
{ \
Certificate_Extension* make(const OID& oid) \
{ \
- if(OIDS::name_of(oid, NAME)) \
- return new Cert_Extension::TYPE(); \
+ if(Botan::OIDS::name_of(oid, NAME)) \
+ return new Botan::Cert_Extension::TYPE(); \
return 0; \
} \
}; \