From 1f0810ab1e1d5ba44c9be9642515924000d8ef10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 24 Oct 2018 07:33:11 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@655 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_crypt/picrypt.cpp | 9 +++++++++ src_main/crypt/picrypt.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src_crypt/picrypt.cpp b/src_crypt/picrypt.cpp index 8317c6ce..f725de79 100644 --- a/src_crypt/picrypt.cpp +++ b/src_crypt/picrypt.cpp @@ -394,6 +394,15 @@ PIByteArray PICrypt::passwordHash(const PIString & password, const PIByteArray & } +PIString PICrypt::version() { +#ifdef PIP_CRYPT + return SODIUM_VERSION_STRING; +#else + return PIString(); +#endif +} + + bool PICrypt::init() { #ifdef PIP_CRYPT static bool inited = false; diff --git a/src_main/crypt/picrypt.h b/src_main/crypt/picrypt.h index 6b632d6a..4ab08459 100644 --- a/src_main/crypt/picrypt.h +++ b/src_main/crypt/picrypt.h @@ -102,6 +102,9 @@ public: //! Generate password hash from "password" static PIByteArray passwordHash(const PIString & password, const PIByteArray & seed); + //! Returns libsodium version + static PIString version(); + private: static bool init();