summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-06-30 12:38:40 +0200
committerVictor Shyba <victor1984@riseup.net>2017-07-08 03:15:05 -0300
commit88d52a578d0d7b06e138820fc0df24ba5f22e0e1 (patch)
tree91ba56f8f90ad4d555d1b6ef3f2b9534881d6448 /docs
parent4672cb4be9c01d89b17b772331531b6502fb72ba (diff)
[feat] use OpenSSL backend for scrypt if available
This needs OpenSSL >= 1.1, otherwise it will keep using the scrypt dependency. We should think about deprecating scrypt as a dependency when we can be sure that the adoption of libssl 1.1 is wide enough. I think that at some point (soledad 0.11 or so) we can drop the scrypt dependency, which was being somehow problematic at times (the _scrypt.so was not appearing when installing with pip, needed workarounds). From that moment on, we can raise an error if an old libssl is found and no scrypt can be imported - leaving that to the user/packager. In debian stretch and afterwards, you can get that version by installing libssl-dev - Related: #8472
Diffstat (limited to 'docs')
-rw-r--r--docs/changelog-next.rst27
-rw-r--r--docs/changelog.rst1
-rw-r--r--docs/index.rst1
3 files changed, 2 insertions, 27 deletions
diff --git a/docs/changelog-next.rst b/docs/changelog-next.rst
deleted file mode 100644
index f7a90692..00000000
--- a/docs/changelog-next.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-0.9.7 -
-+++++++++++++++++++++++++++++++
-
-Please add lines to this file, they will be moved to the CHANGELOG.rst during
-the next release.
-
-There are two template lines for each category, use them as reference.
-
-I've added a new category `Misc` so we can track doc/style/packaging stuff.
-
-Features
-~~~~~~~~
-- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
-- New feature without related issue number.
-
-Bugfixes
-~~~~~~~~
-- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
-- Bugfix without related issue number.
-
-Other
-~~~~~
-- `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
-- Some change without issue number.
-
-Known Issues
-~~~~~~~~~~~~
diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 00000000..565b0521
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../CHANGELOG.rst
diff --git a/docs/index.rst b/docs/index.rst
index 0ebe1a7f..42a82a7a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,7 @@ all user's devices that access a LEAP provider.
incoming_box
deprecation
benchmarks
+ changelog
Indices and tables
==================