aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-10-02 18:51:11 (GMT)
committerJouni Malinen <j@w1.fi>2016-10-02 18:51:11 (GMT)
commit2462f347bca0a7cce7e06ff88adbe3aa47c52d54 (patch)
tree01e2a5bef57e48f4e0261edfd585092f274ce27d
parent8181c13a8de4341d282edd1d6a2fa881bb610ebf (diff)
downloadhostap-2462f347bca0a7cce7e06ff88adbe3aa47c52d54.zip
hostap-2462f347bca0a7cce7e06ff88adbe3aa47c52d54.tar.gz
hostap-2462f347bca0a7cce7e06ff88adbe3aa47c52d54.tar.bz2
Change version number to v2.6 for the releasehostap_2_6
Signed-off-by: Jouni Malinen <j@w1.fi>
-rw-r--r--doc/doxygen.conf2
-rw-r--r--hostapd/ChangeLog2
-rw-r--r--src/common/version.h2
-rw-r--r--wpa_supplicant/ChangeLog2
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 6819a2e..c519094 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -31,7 +31,7 @@ PROJECT_NAME = "wpa_supplicant / hostapd"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.5
+PROJECT_NUMBER = 2.6
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 30b1472..d2b669b 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -1,6 +1,6 @@
ChangeLog for hostapd
-????-??-?? - v2.6
+2016-10-02 - v2.6
* fixed EAP-pwd last fragment validation
[http://w1.fi/security/2015-7/] (CVE-2015-5314)
* fixed WPS configuration update vulnerability with malformed passphrase
diff --git a/src/common/version.h b/src/common/version.h
index ae5c9d4..75e5c6e 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -9,6 +9,6 @@
#define GIT_VERSION_STR_POSTFIX ""
#endif /* GIT_VERSION_STR_POSTFIX */
-#define VERSION_STR "2.6-devel" VERSION_STR_POSTFIX GIT_VERSION_STR_POSTFIX
+#define VERSION_STR "2.6" VERSION_STR_POSTFIX GIT_VERSION_STR_POSTFIX
#endif /* VERSION_H */
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index e62d8c7..f28055f 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1,6 +1,6 @@
ChangeLog for wpa_supplicant
-????-??-?? - v2.6
+2016-10-02 - v2.6
* fixed WNM Sleep Mode processing when PMF is not enabled
[http://w1.fi/security/2015-6/] (CVE-2015-5310)
* fixed EAP-pwd last fragment validation