summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-10-23 17:17:13 +0200
committerSimon Josefsson <simon@josefsson.org>2008-10-23 17:17:13 +0200
commitdf34fbdecce86c00f6287c5f3002078529dcc07e (patch)
treea7d828c9b85fe9f04272765d41a85519e064f249
parentfa5157c86d98d77a0a1337e79fcf8b3ba9d67d39 (diff)
downloadgnutls-df34fbdecce86c00f6287c5f3002078529dcc07e.tar.gz
Revert broken commit.
-rw-r--r--NEWS20
1 files changed, 2 insertions, 18 deletions
diff --git a/NEWS b/NEWS
index 2a820b4880..7bc1a03f01 100644
--- a/NEWS
+++ b/NEWS
@@ -5,24 +5,6 @@ See the end for copying conditions.
* Version 2.6.1 (unreleased)
-** certtool: print a PKCS #8 key even if it is not encrypted.
-
-** API and ABI modifications:
-No changes since last version.
-
-* Version 2.7.0 (released 2008-10-16)
-
-** libgnutls: Added functions to handle CRL extensions.
-
-** libgnutls: Added functions to handle X.509 extensions in Certificate
-Requests.
-
-** libgnutls: Improved error string for GNUTLS_E_AGAIN.
-Suggested by "Lavrentiev, Anton (NIH/NLM/NCBI) [C]" <lavr@ncbi.nlm.nih.gov>.
-
-** certtool: Print and set CRL and CRQ extensions.
->>>>>>> 3eab289... certtool: print a PKCS #8 key even if it is not encrypted.:NEWS
-
** libgnutls-extra: Protect internal symbols with static.
Fixes problem when linking certtool statically. Tiny patch from Aaron
Ucko <ucko@ncbi.nlm.nih.gov>.
@@ -31,6 +13,8 @@ Ucko <ucko@ncbi.nlm.nih.gov>.
It incorrectly returned the subject DN instead of issuer DN in v2.6.0.
Thanks to Thomas Viehmann <tv@beamnet.de> for report.
+** certtool: print a PKCS #8 key even if it is not encrypted.
+
** tests: Make tests compile when using internal libtasn1.
Patch by ludo@gnu.org (Ludovic Courtès).