diff --git a/docs/constants_8h.html b/docs/constants_8h.html
index d7437df..9cc7d8f 100644
--- a/docs/constants_8h.html
+++ b/docs/constants_8h.html
@@ -90,8 +90,10 @@
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
 Macros</h2></td></tr>
-<tr class="memitem:a392b1067fbca2a5590a28a51a22b85d6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6">CECIES_VERSION</a>&#160;&#160;&#160;210</td></tr>
+<tr class="memitem:a392b1067fbca2a5590a28a51a22b85d6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6">CECIES_VERSION</a>&#160;&#160;&#160;212</td></tr>
 <tr class="separator:a392b1067fbca2a5590a28a51a22b85d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a394343a1795e3bf75f587f69f6e09787"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="constants_8h.html#a394343a1795e3bf75f587f69f6e09787">CECIES_VERSION_STR</a>&#160;&#160;&#160;&quot;2.1.2&quot;</td></tr>
+<tr class="separator:a394343a1795e3bf75f587f69f6e09787"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad71e4756e3bc5a1125ca086587286600"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">CECIES_X25519_KEY_SIZE</a>&#160;&#160;&#160;32</td></tr>
 <tr class="separator:ad71e4756e3bc5a1125ca086587286600"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a038c483a06eaff1b607b5720d51cd7ca"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca">CECIES_X448_KEY_SIZE</a>&#160;&#160;&#160;56</td></tr>
@@ -147,12 +149,27 @@ <h2 class="memtitle"><span class="permalink"><a href="#a392b1067fbca2a5590a28a51
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define CECIES_VERSION&#160;&#160;&#160;210</td>
+          <td class="memname">#define CECIES_VERSION&#160;&#160;&#160;212</td>
         </tr>
       </table>
 </div><div class="memdoc">
 <p>The version number of this CECIES implementation. </p>
 
+</div>
+</div>
+<a id="a394343a1795e3bf75f587f69f6e09787"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a394343a1795e3bf75f587f69f6e09787">&#9670;&nbsp;</a></span>CECIES_VERSION_STR</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define CECIES_VERSION_STR&#160;&#160;&#160;&quot;2.1.2&quot;</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<p>The version number of this CECIES implementation (nicely-formatted string). </p>
+
 </div>
 </div>
 <a id="ad71e4756e3bc5a1125ca086587286600"></a>
diff --git a/docs/constants_8h_source.html b/docs/constants_8h_source.html
index 23dc349..5a10b86 100644
--- a/docs/constants_8h_source.html
+++ b/docs/constants_8h_source.html
@@ -92,48 +92,45 @@
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#endif</span></div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160; </div>
-<div class="line"><a name="l00033"></a><span class="lineno"><a class="line" href="constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6">   33</a></span>&#160;<span class="preprocessor">#define CECIES_VERSION 210</span></div>
+<div class="line"><a name="l00033"></a><span class="lineno"><a class="line" href="constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6">   33</a></span>&#160;<span class="preprocessor">#define CECIES_VERSION 212</span></div>
 <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160; </div>
-<div class="line"><a name="l00038"></a><span class="lineno"><a class="line" href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">   38</a></span>&#160;<span class="preprocessor">#define CECIES_X25519_KEY_SIZE 32</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno"><a class="line" href="constants_8h.html#a394343a1795e3bf75f587f69f6e09787">   38</a></span>&#160;<span class="preprocessor">#define CECIES_VERSION_STR &quot;2.1.2&quot;</span></div>
 <div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160; </div>
-<div class="line"><a name="l00043"></a><span class="lineno"><a class="line" href="constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca">   43</a></span>&#160;<span class="preprocessor">#define CECIES_X448_KEY_SIZE 56</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno"><a class="line" href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">   43</a></span>&#160;<span class="preprocessor">#define CECIES_X25519_KEY_SIZE 32</span></div>
 <div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160; </div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="comment">/*</span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="comment"> * Some error codes:</span></div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="comment"> */</span></div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160; </div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_NULL_ARG 1000</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_INVALID_ARG 1001</span></div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_INSUFFICIENT_OUTPUT_BUFFER_SIZE 1002</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_OUT_OF_MEMORY 1003</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno"><a class="line" href="constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca">   48</a></span>&#160;<span class="preprocessor">#define CECIES_X448_KEY_SIZE 56</span></div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160; </div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="comment">/*</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="comment"> * Some error codes:</span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="comment"> */</span></div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160; </div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_NULL_ARG 2000</span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_INVALID_ARG 2001</span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_INSUFFICIENT_OUTPUT_BUFFER_SIZE 2002</span></div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_OUT_OF_MEMORY 2003</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_NULL_ARG 1000</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_INVALID_ARG 1001</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_INSUFFICIENT_OUTPUT_BUFFER_SIZE 1002</span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="preprocessor">#define CECIES_ENCRYPT_ERROR_CODE_OUT_OF_MEMORY 1003</span></div>
 <div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160; </div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="preprocessor">#define CECIES_KEYGEN_ERROR_CODE_NULL_ARG 7000</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="preprocessor">#define CECIES_KEYGEN_ERROR_CODE_INVALID_ARG 7001</span></div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160; </div>
-<div class="line"><a name="l00065"></a><span class="lineno"><a class="line" href="constants_8h.html#a6e029ca711d467cec6c1dde04be91228">   65</a></span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> <a class="code" href="constants_8h.html#a6e029ca711d467cec6c1dde04be91228">empty32</a>[32] = {</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="comment">//</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_NULL_ARG 2000</span></div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_INVALID_ARG 2001</span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_INSUFFICIENT_OUTPUT_BUFFER_SIZE 2002</span></div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;<span class="preprocessor">#define CECIES_DECRYPT_ERROR_CODE_OUT_OF_MEMORY 2003</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160; </div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;<span class="preprocessor">#define CECIES_KEYGEN_ERROR_CODE_NULL_ARG 7000</span></div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;<span class="preprocessor">#define CECIES_KEYGEN_ERROR_CODE_INVALID_ARG 7001</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160; </div>
+<div class="line"><a name="l00070"></a><span class="lineno"><a class="line" href="constants_8h.html#a6e029ca711d467cec6c1dde04be91228">   70</a></span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> <a class="code" href="constants_8h.html#a6e029ca711d467cec6c1dde04be91228">empty32</a>[32] = {</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;    <span class="comment">//</span></div>
 <div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;};</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160; </div>
-<div class="line"><a name="l00080"></a><span class="lineno"><a class="line" href="constants_8h.html#a065e72301221b809831106b92143a428">   80</a></span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> <a class="code" href="constants_8h.html#a065e72301221b809831106b92143a428">empty64</a>[64] = {</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="comment">//</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;};</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160; </div>
+<div class="line"><a name="l00085"></a><span class="lineno"><a class="line" href="constants_8h.html#a065e72301221b809831106b92143a428">   85</a></span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> <a class="code" href="constants_8h.html#a065e72301221b809831106b92143a428">empty64</a>[64] = {</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    <span class="comment">//</span></div>
 <div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
@@ -145,15 +142,15 @@
 <div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;};</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160; </div>
-<div class="line"><a name="l00103"></a><span class="lineno"><a class="line" href="constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722">  103</a></span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> <a class="code" href="constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722">empty256</a>[256] = {</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;    <span class="comment">//</span></div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;};</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160; </div>
+<div class="line"><a name="l00108"></a><span class="lineno"><a class="line" href="constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722">  108</a></span>&#160;<span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> <a class="code" href="constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722">empty256</a>[256] = {</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;    <span class="comment">//</span></div>
 <div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
@@ -213,17 +210,22 @@
 <div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
 <div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;};</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160; </div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;} <span class="comment">// extern &quot;C&quot;</span></div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;<span class="preprocessor">#endif</span></div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160; </div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;<span class="preprocessor">#endif // CECIES_CONSTANTS_H</span></div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;    0x00, 0x00, 0x00, 0x00, <span class="comment">//</span></div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;};</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160; </div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;} <span class="comment">// extern &quot;C&quot;</span></div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;<span class="preprocessor">#endif</span></div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160; </div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;<span class="preprocessor">#endif // CECIES_CONSTANTS_H</span></div>
 </div><!-- fragment --></div><!-- contents -->
-<div class="ttc" id="aconstants_8h_html_a3af06471acf8ae0d71b8cacfaa64b722"><div class="ttname"><a href="constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722">empty256</a></div><div class="ttdeci">static const unsigned char empty256[256]</div><div class="ttdef"><b>Definition:</b> constants.h:103</div></div>
-<div class="ttc" id="aconstants_8h_html_a6e029ca711d467cec6c1dde04be91228"><div class="ttname"><a href="constants_8h.html#a6e029ca711d467cec6c1dde04be91228">empty32</a></div><div class="ttdeci">static const unsigned char empty32[32]</div><div class="ttdef"><b>Definition:</b> constants.h:65</div></div>
-<div class="ttc" id="aconstants_8h_html_a065e72301221b809831106b92143a428"><div class="ttname"><a href="constants_8h.html#a065e72301221b809831106b92143a428">empty64</a></div><div class="ttdeci">static const unsigned char empty64[64]</div><div class="ttdef"><b>Definition:</b> constants.h:80</div></div>
+<div class="ttc" id="aconstants_8h_html_a3af06471acf8ae0d71b8cacfaa64b722"><div class="ttname"><a href="constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722">empty256</a></div><div class="ttdeci">static const unsigned char empty256[256]</div><div class="ttdef"><b>Definition:</b> constants.h:108</div></div>
+<div class="ttc" id="aconstants_8h_html_a6e029ca711d467cec6c1dde04be91228"><div class="ttname"><a href="constants_8h.html#a6e029ca711d467cec6c1dde04be91228">empty32</a></div><div class="ttdeci">static const unsigned char empty32[32]</div><div class="ttdef"><b>Definition:</b> constants.h:70</div></div>
+<div class="ttc" id="aconstants_8h_html_a065e72301221b809831106b92143a428"><div class="ttname"><a href="constants_8h.html#a065e72301221b809831106b92143a428">empty64</a></div><div class="ttdeci">static const unsigned char empty64[64]</div><div class="ttdef"><b>Definition:</b> constants.h:85</div></div>
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
diff --git a/docs/globals.html b/docs/globals.html
index bd9c66d..81ec95e 100644
--- a/docs/globals.html
+++ b/docs/globals.html
@@ -151,6 +151,9 @@ <h3><a id="index_c"></a>- c -</h3><ul>
 <li>CECIES_VERSION
 : <a class="el" href="constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6">constants.h</a>
 </li>
+<li>CECIES_VERSION_STR
+: <a class="el" href="constants_8h.html#a394343a1795e3bf75f587f69f6e09787">constants.h</a>
+</li>
 <li>CECIES_X25519_KEY_SIZE
 : <a class="el" href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">constants.h</a>
 </li>
diff --git a/docs/globals_defs.html b/docs/globals_defs.html
index 48620ff..1bcbb25 100644
--- a/docs/globals_defs.html
+++ b/docs/globals_defs.html
@@ -71,6 +71,9 @@
 <li>CECIES_VERSION
 : <a class="el" href="constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6">constants.h</a>
 </li>
+<li>CECIES_VERSION_STR
+: <a class="el" href="constants_8h.html#a394343a1795e3bf75f587f69f6e09787">constants.h</a>
+</li>
 <li>CECIES_X25519_KEY_SIZE
 : <a class="el" href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">constants.h</a>
 </li>
diff --git a/docs/search/all_0.js b/docs/search/all_0.js
index 8416c1d..5b53e0e 100644
--- a/docs/search/all_0.js
+++ b/docs/search/all_0.js
@@ -29,7 +29,8 @@ var searchData=
   ['cecies_5fnew_5fguid_26',['cecies_new_guid',['../guid_8h.html#aa92ec1e1560a820319c11aa85572cd9a',1,'guid.h']]],
   ['cecies_5fprintvoid_27',['cecies_printvoid',['../util_8h.html#a289a1479fbe884b60dd256c2cfecc735',1,'util.h']]],
   ['cecies_5fversion_28',['CECIES_VERSION',['../constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6',1,'constants.h']]],
-  ['cecies_5fx25519_5fkey_5fsize_29',['CECIES_X25519_KEY_SIZE',['../constants_8h.html#ad71e4756e3bc5a1125ca086587286600',1,'constants.h']]],
-  ['cecies_5fx448_5fkey_5fsize_30',['CECIES_X448_KEY_SIZE',['../constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca',1,'constants.h']]],
-  ['constants_2eh_31',['constants.h',['../constants_8h.html',1,'']]]
+  ['cecies_5fversion_5fstr_29',['CECIES_VERSION_STR',['../constants_8h.html#a394343a1795e3bf75f587f69f6e09787',1,'constants.h']]],
+  ['cecies_5fx25519_5fkey_5fsize_30',['CECIES_X25519_KEY_SIZE',['../constants_8h.html#ad71e4756e3bc5a1125ca086587286600',1,'constants.h']]],
+  ['cecies_5fx448_5fkey_5fsize_31',['CECIES_X448_KEY_SIZE',['../constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca',1,'constants.h']]],
+  ['constants_2eh_32',['constants.h',['../constants_8h.html',1,'']]]
 ];
diff --git a/docs/search/all_1.js b/docs/search/all_1.js
index 3492835..de6a189 100644
--- a/docs/search/all_1.js
+++ b/docs/search/all_1.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['decrypt_2eh_32',['decrypt.h',['../decrypt_8h.html',1,'']]]
+  ['decrypt_2eh_33',['decrypt.h',['../decrypt_8h.html',1,'']]]
 ];
diff --git a/docs/search/all_2.js b/docs/search/all_2.js
index 734af06..762277e 100644
--- a/docs/search/all_2.js
+++ b/docs/search/all_2.js
@@ -1,7 +1,7 @@
 var searchData=
 [
-  ['empty256_33',['empty256',['../constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722',1,'constants.h']]],
-  ['empty32_34',['empty32',['../constants_8h.html#a6e029ca711d467cec6c1dde04be91228',1,'constants.h']]],
-  ['empty64_35',['empty64',['../constants_8h.html#a065e72301221b809831106b92143a428',1,'constants.h']]],
-  ['encrypt_2eh_36',['encrypt.h',['../encrypt_8h.html',1,'']]]
+  ['empty256_34',['empty256',['../constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722',1,'constants.h']]],
+  ['empty32_35',['empty32',['../constants_8h.html#a6e029ca711d467cec6c1dde04be91228',1,'constants.h']]],
+  ['empty64_36',['empty64',['../constants_8h.html#a065e72301221b809831106b92143a428',1,'constants.h']]],
+  ['encrypt_2eh_37',['encrypt.h',['../encrypt_8h.html',1,'']]]
 ];
diff --git a/docs/search/all_3.js b/docs/search/all_3.js
index df717b5..4e77bec 100644
--- a/docs/search/all_3.js
+++ b/docs/search/all_3.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['guid_2eh_37',['guid.h',['../guid_8h.html',1,'']]]
+  ['guid_2eh_38',['guid.h',['../guid_8h.html',1,'']]]
 ];
diff --git a/docs/search/all_4.js b/docs/search/all_4.js
index 20813ac..0cf01be 100644
--- a/docs/search/all_4.js
+++ b/docs/search/all_4.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['hexstring_38',['hexstring',['../structcecies__curve25519__key.html#abf381ec507ffbc17e84640fd8bbbcb03',1,'cecies_curve25519_key::hexstring()'],['../structcecies__curve448__key.html#a97ad4b93f4ae3f1ee51e0ec9d30b310d',1,'cecies_curve448_key::hexstring()']]]
+  ['hexstring_39',['hexstring',['../structcecies__curve25519__key.html#abf381ec507ffbc17e84640fd8bbbcb03',1,'cecies_curve25519_key::hexstring()'],['../structcecies__curve448__key.html#a97ad4b93f4ae3f1ee51e0ec9d30b310d',1,'cecies_curve448_key::hexstring()']]]
 ];
diff --git a/docs/search/all_5.js b/docs/search/all_5.js
index 2bbf268..7ffe547 100644
--- a/docs/search/all_5.js
+++ b/docs/search/all_5.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['keygen_2eh_39',['keygen.h',['../keygen_8h.html',1,'']]]
+  ['keygen_2eh_40',['keygen.h',['../keygen_8h.html',1,'']]]
 ];
diff --git a/docs/search/all_6.js b/docs/search/all_6.js
index ee652ef..9984c64 100644
--- a/docs/search/all_6.js
+++ b/docs/search/all_6.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['private_5fkey_40',['private_key',['../structcecies__curve25519__keypair.html#ac72f7a88ed2dc2c24d10f19db50664ce',1,'cecies_curve25519_keypair::private_key()'],['../structcecies__curve448__keypair.html#a64221be323012411324f3d1dc93c2095',1,'cecies_curve448_keypair::private_key()']]],
-  ['public_5fkey_41',['public_key',['../structcecies__curve25519__keypair.html#a156721930b32d486d90284611d98f891',1,'cecies_curve25519_keypair::public_key()'],['../structcecies__curve448__keypair.html#ad391bdc968191a52ca93b53d3f834a25',1,'cecies_curve448_keypair::public_key()']]]
+  ['private_5fkey_41',['private_key',['../structcecies__curve25519__keypair.html#ac72f7a88ed2dc2c24d10f19db50664ce',1,'cecies_curve25519_keypair::private_key()'],['../structcecies__curve448__keypair.html#a64221be323012411324f3d1dc93c2095',1,'cecies_curve448_keypair::private_key()']]],
+  ['public_5fkey_42',['public_key',['../structcecies__curve25519__keypair.html#a156721930b32d486d90284611d98f891',1,'cecies_curve25519_keypair::public_key()'],['../structcecies__curve448__keypair.html#ad391bdc968191a52ca93b53d3f834a25',1,'cecies_curve448_keypair::public_key()']]]
 ];
diff --git a/docs/search/all_7.js b/docs/search/all_7.js
index d1ce99d..6c4b2a5 100644
--- a/docs/search/all_7.js
+++ b/docs/search/all_7.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['string_42',['string',['../structcecies__guid.html#a5fe66f9ac5002d573ecb1901a5eaca43',1,'cecies_guid']]]
+  ['string_43',['string',['../structcecies__guid.html#a5fe66f9ac5002d573ecb1901a5eaca43',1,'cecies_guid']]]
 ];
diff --git a/docs/search/all_8.js b/docs/search/all_8.js
index c471b74..8945e9d 100644
--- a/docs/search/all_8.js
+++ b/docs/search/all_8.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['types_2eh_43',['types.h',['../types_8h.html',1,'']]]
+  ['types_2eh_44',['types.h',['../types_8h.html',1,'']]]
 ];
diff --git a/docs/search/all_9.js b/docs/search/all_9.js
index 0695fe1..3e7cc47 100644
--- a/docs/search/all_9.js
+++ b/docs/search/all_9.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['util_2eh_44',['util.h',['../util_8h.html',1,'']]]
+  ['util_2eh_45',['util.h',['../util_8h.html',1,'']]]
 ];
diff --git a/docs/search/classes_0.js b/docs/search/classes_0.js
index ab3a3e7..30751c5 100644
--- a/docs/search/classes_0.js
+++ b/docs/search/classes_0.js
@@ -1,8 +1,8 @@
 var searchData=
 [
-  ['cecies_5fcurve25519_5fkey_45',['cecies_curve25519_key',['../structcecies__curve25519__key.html',1,'']]],
-  ['cecies_5fcurve25519_5fkeypair_46',['cecies_curve25519_keypair',['../structcecies__curve25519__keypair.html',1,'']]],
-  ['cecies_5fcurve448_5fkey_47',['cecies_curve448_key',['../structcecies__curve448__key.html',1,'']]],
-  ['cecies_5fcurve448_5fkeypair_48',['cecies_curve448_keypair',['../structcecies__curve448__keypair.html',1,'']]],
-  ['cecies_5fguid_49',['cecies_guid',['../structcecies__guid.html',1,'']]]
+  ['cecies_5fcurve25519_5fkey_46',['cecies_curve25519_key',['../structcecies__curve25519__key.html',1,'']]],
+  ['cecies_5fcurve25519_5fkeypair_47',['cecies_curve25519_keypair',['../structcecies__curve25519__keypair.html',1,'']]],
+  ['cecies_5fcurve448_5fkey_48',['cecies_curve448_key',['../structcecies__curve448__key.html',1,'']]],
+  ['cecies_5fcurve448_5fkeypair_49',['cecies_curve448_keypair',['../structcecies__curve448__keypair.html',1,'']]],
+  ['cecies_5fguid_50',['cecies_guid',['../structcecies__guid.html',1,'']]]
 ];
diff --git a/docs/search/defines_0.js b/docs/search/defines_0.js
index 4d01292..fd1ccbc 100644
--- a/docs/search/defines_0.js
+++ b/docs/search/defines_0.js
@@ -1,8 +1,9 @@
 var searchData=
 [
-  ['cecies_5fmax_90',['CECIES_MAX',['../util_8h.html#aaeccc2ccc982178c6bf0f0636522eeab',1,'util.h']]],
-  ['cecies_5fmin_91',['CECIES_MIN',['../util_8h.html#af44809f966d732184ff45c5c477ea9e0',1,'util.h']]],
-  ['cecies_5fversion_92',['CECIES_VERSION',['../constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6',1,'constants.h']]],
-  ['cecies_5fx25519_5fkey_5fsize_93',['CECIES_X25519_KEY_SIZE',['../constants_8h.html#ad71e4756e3bc5a1125ca086587286600',1,'constants.h']]],
-  ['cecies_5fx448_5fkey_5fsize_94',['CECIES_X448_KEY_SIZE',['../constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca',1,'constants.h']]]
+  ['cecies_5fmax_91',['CECIES_MAX',['../util_8h.html#aaeccc2ccc982178c6bf0f0636522eeab',1,'util.h']]],
+  ['cecies_5fmin_92',['CECIES_MIN',['../util_8h.html#af44809f966d732184ff45c5c477ea9e0',1,'util.h']]],
+  ['cecies_5fversion_93',['CECIES_VERSION',['../constants_8h.html#a392b1067fbca2a5590a28a51a22b85d6',1,'constants.h']]],
+  ['cecies_5fversion_5fstr_94',['CECIES_VERSION_STR',['../constants_8h.html#a394343a1795e3bf75f587f69f6e09787',1,'constants.h']]],
+  ['cecies_5fx25519_5fkey_5fsize_95',['CECIES_X25519_KEY_SIZE',['../constants_8h.html#ad71e4756e3bc5a1125ca086587286600',1,'constants.h']]],
+  ['cecies_5fx448_5fkey_5fsize_96',['CECIES_X448_KEY_SIZE',['../constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca',1,'constants.h']]]
 ];
diff --git a/docs/search/files_0.js b/docs/search/files_0.js
index ad7626c..58c7dde 100644
--- a/docs/search/files_0.js
+++ b/docs/search/files_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['constants_2eh_50',['constants.h',['../constants_8h.html',1,'']]]
+  ['constants_2eh_51',['constants.h',['../constants_8h.html',1,'']]]
 ];
diff --git a/docs/search/files_1.js b/docs/search/files_1.js
index fde366f..12c5682 100644
--- a/docs/search/files_1.js
+++ b/docs/search/files_1.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['decrypt_2eh_51',['decrypt.h',['../decrypt_8h.html',1,'']]]
+  ['decrypt_2eh_52',['decrypt.h',['../decrypt_8h.html',1,'']]]
 ];
diff --git a/docs/search/files_2.js b/docs/search/files_2.js
index aeca2d5..8780666 100644
--- a/docs/search/files_2.js
+++ b/docs/search/files_2.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['encrypt_2eh_52',['encrypt.h',['../encrypt_8h.html',1,'']]]
+  ['encrypt_2eh_53',['encrypt.h',['../encrypt_8h.html',1,'']]]
 ];
diff --git a/docs/search/files_3.js b/docs/search/files_3.js
index 35db33c..3bdc2ce 100644
--- a/docs/search/files_3.js
+++ b/docs/search/files_3.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['guid_2eh_53',['guid.h',['../guid_8h.html',1,'']]]
+  ['guid_2eh_54',['guid.h',['../guid_8h.html',1,'']]]
 ];
diff --git a/docs/search/files_4.js b/docs/search/files_4.js
index da4dc17..810acb8 100644
--- a/docs/search/files_4.js
+++ b/docs/search/files_4.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['keygen_2eh_54',['keygen.h',['../keygen_8h.html',1,'']]]
+  ['keygen_2eh_55',['keygen.h',['../keygen_8h.html',1,'']]]
 ];
diff --git a/docs/search/files_5.js b/docs/search/files_5.js
index 02159b2..3c923b9 100644
--- a/docs/search/files_5.js
+++ b/docs/search/files_5.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['types_2eh_55',['types.h',['../types_8h.html',1,'']]]
+  ['types_2eh_56',['types.h',['../types_8h.html',1,'']]]
 ];
diff --git a/docs/search/files_6.js b/docs/search/files_6.js
index acb7776..f6b7e6b 100644
--- a/docs/search/files_6.js
+++ b/docs/search/files_6.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['util_2eh_56',['util.h',['../util_8h.html',1,'']]]
+  ['util_2eh_57',['util.h',['../util_8h.html',1,'']]]
 ];
diff --git a/docs/search/functions_0.js b/docs/search/functions_0.js
index 39ac05e..bd45fc9 100644
--- a/docs/search/functions_0.js
+++ b/docs/search/functions_0.js
@@ -1,24 +1,24 @@
 var searchData=
 [
-  ['cecies_5fbin2hexstr_57',['cecies_bin2hexstr',['../util_8h.html#afccb537b6e0242c4582b4aca9d2294b9',1,'util.h']]],
-  ['cecies_5fcalc_5faes_5fcbc_5fciphertext_5flength_58',['cecies_calc_aes_cbc_ciphertext_length',['../util_8h.html#a335269d0e79567b20346bd39108403b0',1,'util.h']]],
-  ['cecies_5fcalc_5fbase64_5flength_59',['cecies_calc_base64_length',['../util_8h.html#ab6f12030d84b957f37ae69c27d70c497',1,'util.h']]],
-  ['cecies_5fcalc_5foutput_5fbuffer_5fneeded_5fsize_60',['cecies_calc_output_buffer_needed_size',['../util_8h.html#a838f6a0f17cec65d970cb5a407c58e7e',1,'util.h']]],
-  ['cecies_5fcurve25519_5fcalc_5foutput_5fbuffer_5fneeded_5fsize_61',['cecies_curve25519_calc_output_buffer_needed_size',['../util_8h.html#af3b8cd9fc39f89ca430a1e5f084d055c',1,'util.h']]],
-  ['cecies_5fcurve25519_5fdecrypt_62',['cecies_curve25519_decrypt',['../decrypt_8h.html#aa17d0dd0ab27f803290272f1856eee7a',1,'decrypt.h']]],
-  ['cecies_5fcurve25519_5fencrypt_63',['cecies_curve25519_encrypt',['../encrypt_8h.html#aa7f3b8594b88f6897e4785ffed785bdb',1,'encrypt.h']]],
-  ['cecies_5fcurve448_5fcalc_5foutput_5fbuffer_5fneeded_5fsize_64',['cecies_curve448_calc_output_buffer_needed_size',['../util_8h.html#a72712b76d6f0872e29095599bb166259',1,'util.h']]],
-  ['cecies_5fcurve448_5fdecrypt_65',['cecies_curve448_decrypt',['../decrypt_8h.html#a69c0c9e8358d6fa7e15d288455b79d39',1,'decrypt.h']]],
-  ['cecies_5fcurve448_5fencrypt_66',['cecies_curve448_encrypt',['../encrypt_8h.html#a20656234ff36e920431c1c3926c5cec5',1,'encrypt.h']]],
-  ['cecies_5fdev_5furandom_67',['cecies_dev_urandom',['../util_8h.html#a4a3207be38324b7f2353cb5650157fe4',1,'util.h']]],
-  ['cecies_5fdisable_5ffprintf_68',['cecies_disable_fprintf',['../util_8h.html#ac18593b2c57aefd5682a3ca2167e6918',1,'util.h']]],
-  ['cecies_5fempty_5fguid_69',['cecies_empty_guid',['../guid_8h.html#a97dff5afede136e04914c9463e1eba52',1,'guid.h']]],
-  ['cecies_5fenable_5ffprintf_70',['cecies_enable_fprintf',['../util_8h.html#a5f90dc04b65495517eef75f9fe6b5eba',1,'util.h']]],
-  ['cecies_5fgenerate_5fcurve25519_5fkeypair_71',['cecies_generate_curve25519_keypair',['../keygen_8h.html#ab1f4476603237d93e21cc298a829c3bc',1,'keygen.h']]],
-  ['cecies_5fgenerate_5fcurve448_5fkeypair_72',['cecies_generate_curve448_keypair',['../keygen_8h.html#a0ad96b949f15609546999780dbc484a2',1,'keygen.h']]],
-  ['cecies_5fget_5frandom_5fbig_5finteger_73',['cecies_get_random_big_integer',['../util_8h.html#afccad4d81076bc94026ff47bf99c582a',1,'util.h']]],
-  ['cecies_5fhexstr2bin_74',['cecies_hexstr2bin',['../util_8h.html#ac695d2e7f1fccadc0f74f274d9bd6ca9',1,'util.h']]],
-  ['cecies_5fis_5ffprintf_5fenabled_75',['cecies_is_fprintf_enabled',['../util_8h.html#afc3a7b97b407414fca63eb019a9e7116',1,'util.h']]],
-  ['cecies_5fnew_5fguid_76',['cecies_new_guid',['../guid_8h.html#aa92ec1e1560a820319c11aa85572cd9a',1,'guid.h']]],
-  ['cecies_5fprintvoid_77',['cecies_printvoid',['../util_8h.html#a289a1479fbe884b60dd256c2cfecc735',1,'util.h']]]
+  ['cecies_5fbin2hexstr_58',['cecies_bin2hexstr',['../util_8h.html#afccb537b6e0242c4582b4aca9d2294b9',1,'util.h']]],
+  ['cecies_5fcalc_5faes_5fcbc_5fciphertext_5flength_59',['cecies_calc_aes_cbc_ciphertext_length',['../util_8h.html#a335269d0e79567b20346bd39108403b0',1,'util.h']]],
+  ['cecies_5fcalc_5fbase64_5flength_60',['cecies_calc_base64_length',['../util_8h.html#ab6f12030d84b957f37ae69c27d70c497',1,'util.h']]],
+  ['cecies_5fcalc_5foutput_5fbuffer_5fneeded_5fsize_61',['cecies_calc_output_buffer_needed_size',['../util_8h.html#a838f6a0f17cec65d970cb5a407c58e7e',1,'util.h']]],
+  ['cecies_5fcurve25519_5fcalc_5foutput_5fbuffer_5fneeded_5fsize_62',['cecies_curve25519_calc_output_buffer_needed_size',['../util_8h.html#af3b8cd9fc39f89ca430a1e5f084d055c',1,'util.h']]],
+  ['cecies_5fcurve25519_5fdecrypt_63',['cecies_curve25519_decrypt',['../decrypt_8h.html#aa17d0dd0ab27f803290272f1856eee7a',1,'decrypt.h']]],
+  ['cecies_5fcurve25519_5fencrypt_64',['cecies_curve25519_encrypt',['../encrypt_8h.html#aa7f3b8594b88f6897e4785ffed785bdb',1,'encrypt.h']]],
+  ['cecies_5fcurve448_5fcalc_5foutput_5fbuffer_5fneeded_5fsize_65',['cecies_curve448_calc_output_buffer_needed_size',['../util_8h.html#a72712b76d6f0872e29095599bb166259',1,'util.h']]],
+  ['cecies_5fcurve448_5fdecrypt_66',['cecies_curve448_decrypt',['../decrypt_8h.html#a69c0c9e8358d6fa7e15d288455b79d39',1,'decrypt.h']]],
+  ['cecies_5fcurve448_5fencrypt_67',['cecies_curve448_encrypt',['../encrypt_8h.html#a20656234ff36e920431c1c3926c5cec5',1,'encrypt.h']]],
+  ['cecies_5fdev_5furandom_68',['cecies_dev_urandom',['../util_8h.html#a4a3207be38324b7f2353cb5650157fe4',1,'util.h']]],
+  ['cecies_5fdisable_5ffprintf_69',['cecies_disable_fprintf',['../util_8h.html#ac18593b2c57aefd5682a3ca2167e6918',1,'util.h']]],
+  ['cecies_5fempty_5fguid_70',['cecies_empty_guid',['../guid_8h.html#a97dff5afede136e04914c9463e1eba52',1,'guid.h']]],
+  ['cecies_5fenable_5ffprintf_71',['cecies_enable_fprintf',['../util_8h.html#a5f90dc04b65495517eef75f9fe6b5eba',1,'util.h']]],
+  ['cecies_5fgenerate_5fcurve25519_5fkeypair_72',['cecies_generate_curve25519_keypair',['../keygen_8h.html#ab1f4476603237d93e21cc298a829c3bc',1,'keygen.h']]],
+  ['cecies_5fgenerate_5fcurve448_5fkeypair_73',['cecies_generate_curve448_keypair',['../keygen_8h.html#a0ad96b949f15609546999780dbc484a2',1,'keygen.h']]],
+  ['cecies_5fget_5frandom_5fbig_5finteger_74',['cecies_get_random_big_integer',['../util_8h.html#afccad4d81076bc94026ff47bf99c582a',1,'util.h']]],
+  ['cecies_5fhexstr2bin_75',['cecies_hexstr2bin',['../util_8h.html#ac695d2e7f1fccadc0f74f274d9bd6ca9',1,'util.h']]],
+  ['cecies_5fis_5ffprintf_5fenabled_76',['cecies_is_fprintf_enabled',['../util_8h.html#afc3a7b97b407414fca63eb019a9e7116',1,'util.h']]],
+  ['cecies_5fnew_5fguid_77',['cecies_new_guid',['../guid_8h.html#aa92ec1e1560a820319c11aa85572cd9a',1,'guid.h']]],
+  ['cecies_5fprintvoid_78',['cecies_printvoid',['../util_8h.html#a289a1479fbe884b60dd256c2cfecc735',1,'util.h']]]
 ];
diff --git a/docs/search/typedefs_0.js b/docs/search/typedefs_0.js
index 37b6f68..3751b51 100644
--- a/docs/search/typedefs_0.js
+++ b/docs/search/typedefs_0.js
@@ -1,8 +1,8 @@
 var searchData=
 [
-  ['cecies_5fcurve25519_5fkey_85',['cecies_curve25519_key',['../types_8h.html#adf244bee9df1091834dbda5c0f18e2a0',1,'types.h']]],
-  ['cecies_5fcurve25519_5fkeypair_86',['cecies_curve25519_keypair',['../types_8h.html#addd1c911ce5a833022358ae17cdc7c75',1,'types.h']]],
-  ['cecies_5fcurve448_5fkey_87',['cecies_curve448_key',['../types_8h.html#a6c786571c60119510497e27e5836a533',1,'types.h']]],
-  ['cecies_5fcurve448_5fkeypair_88',['cecies_curve448_keypair',['../types_8h.html#a1a8e8a6e53174f4b812a2dfb5c25adc2',1,'types.h']]],
-  ['cecies_5fguid_89',['cecies_guid',['../types_8h.html#a2249150a13a7a273d3ff74400d931642',1,'types.h']]]
+  ['cecies_5fcurve25519_5fkey_86',['cecies_curve25519_key',['../types_8h.html#adf244bee9df1091834dbda5c0f18e2a0',1,'types.h']]],
+  ['cecies_5fcurve25519_5fkeypair_87',['cecies_curve25519_keypair',['../types_8h.html#addd1c911ce5a833022358ae17cdc7c75',1,'types.h']]],
+  ['cecies_5fcurve448_5fkey_88',['cecies_curve448_key',['../types_8h.html#a6c786571c60119510497e27e5836a533',1,'types.h']]],
+  ['cecies_5fcurve448_5fkeypair_89',['cecies_curve448_keypair',['../types_8h.html#a1a8e8a6e53174f4b812a2dfb5c25adc2',1,'types.h']]],
+  ['cecies_5fguid_90',['cecies_guid',['../types_8h.html#a2249150a13a7a273d3ff74400d931642',1,'types.h']]]
 ];
diff --git a/docs/search/variables_0.js b/docs/search/variables_0.js
index b561aef..d93dbf2 100644
--- a/docs/search/variables_0.js
+++ b/docs/search/variables_0.js
@@ -1,6 +1,6 @@
 var searchData=
 [
-  ['empty256_78',['empty256',['../constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722',1,'constants.h']]],
-  ['empty32_79',['empty32',['../constants_8h.html#a6e029ca711d467cec6c1dde04be91228',1,'constants.h']]],
-  ['empty64_80',['empty64',['../constants_8h.html#a065e72301221b809831106b92143a428',1,'constants.h']]]
+  ['empty256_79',['empty256',['../constants_8h.html#a3af06471acf8ae0d71b8cacfaa64b722',1,'constants.h']]],
+  ['empty32_80',['empty32',['../constants_8h.html#a6e029ca711d467cec6c1dde04be91228',1,'constants.h']]],
+  ['empty64_81',['empty64',['../constants_8h.html#a065e72301221b809831106b92143a428',1,'constants.h']]]
 ];
diff --git a/docs/search/variables_1.js b/docs/search/variables_1.js
index 8aad301..8f698e6 100644
--- a/docs/search/variables_1.js
+++ b/docs/search/variables_1.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['hexstring_81',['hexstring',['../structcecies__curve25519__key.html#abf381ec507ffbc17e84640fd8bbbcb03',1,'cecies_curve25519_key::hexstring()'],['../structcecies__curve448__key.html#a97ad4b93f4ae3f1ee51e0ec9d30b310d',1,'cecies_curve448_key::hexstring()']]]
+  ['hexstring_82',['hexstring',['../structcecies__curve25519__key.html#abf381ec507ffbc17e84640fd8bbbcb03',1,'cecies_curve25519_key::hexstring()'],['../structcecies__curve448__key.html#a97ad4b93f4ae3f1ee51e0ec9d30b310d',1,'cecies_curve448_key::hexstring()']]]
 ];
diff --git a/docs/search/variables_2.js b/docs/search/variables_2.js
index 87eebcd..419650c 100644
--- a/docs/search/variables_2.js
+++ b/docs/search/variables_2.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['private_5fkey_82',['private_key',['../structcecies__curve25519__keypair.html#ac72f7a88ed2dc2c24d10f19db50664ce',1,'cecies_curve25519_keypair::private_key()'],['../structcecies__curve448__keypair.html#a64221be323012411324f3d1dc93c2095',1,'cecies_curve448_keypair::private_key()']]],
-  ['public_5fkey_83',['public_key',['../structcecies__curve25519__keypair.html#a156721930b32d486d90284611d98f891',1,'cecies_curve25519_keypair::public_key()'],['../structcecies__curve448__keypair.html#ad391bdc968191a52ca93b53d3f834a25',1,'cecies_curve448_keypair::public_key()']]]
+  ['private_5fkey_83',['private_key',['../structcecies__curve25519__keypair.html#ac72f7a88ed2dc2c24d10f19db50664ce',1,'cecies_curve25519_keypair::private_key()'],['../structcecies__curve448__keypair.html#a64221be323012411324f3d1dc93c2095',1,'cecies_curve448_keypair::private_key()']]],
+  ['public_5fkey_84',['public_key',['../structcecies__curve25519__keypair.html#a156721930b32d486d90284611d98f891',1,'cecies_curve25519_keypair::public_key()'],['../structcecies__curve448__keypair.html#ad391bdc968191a52ca93b53d3f834a25',1,'cecies_curve448_keypair::public_key()']]]
 ];
diff --git a/docs/search/variables_3.js b/docs/search/variables_3.js
index b6e042e..bff1218 100644
--- a/docs/search/variables_3.js
+++ b/docs/search/variables_3.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['string_84',['string',['../structcecies__guid.html#a5fe66f9ac5002d573ecb1901a5eaca43',1,'cecies_guid']]]
+  ['string_85',['string',['../structcecies__guid.html#a5fe66f9ac5002d573ecb1901a5eaca43',1,'cecies_guid']]]
 ];
diff --git a/docs/util_8h_source.html b/docs/util_8h_source.html
index f785fb2..8b43f94 100644
--- a/docs/util_8h_source.html
+++ b/docs/util_8h_source.html
@@ -197,9 +197,9 @@
 <div class="ttc" id="autil_8h_html_afc3a7b97b407414fca63eb019a9e7116"><div class="ttname"><a href="util_8h.html#afc3a7b97b407414fca63eb019a9e7116">cecies_is_fprintf_enabled</a></div><div class="ttdeci">bool cecies_is_fprintf_enabled()</div></div>
 <div class="ttc" id="autil_8h_html_af3b8cd9fc39f89ca430a1e5f084d055c"><div class="ttname"><a href="util_8h.html#af3b8cd9fc39f89ca430a1e5f084d055c">cecies_curve25519_calc_output_buffer_needed_size</a></div><div class="ttdeci">static size_t cecies_curve25519_calc_output_buffer_needed_size(const size_t input_buffer_length)</div><div class="ttdef"><b>Definition:</b> util.h:88</div></div>
 <div class="ttc" id="autil_8h_html_afccb537b6e0242c4582b4aca9d2294b9"><div class="ttname"><a href="util_8h.html#afccb537b6e0242c4582b4aca9d2294b9">cecies_bin2hexstr</a></div><div class="ttdeci">int cecies_bin2hexstr(const unsigned char *bin, size_t bin_length, char *output, size_t output_size, size_t *output_length, bool uppercase)</div></div>
-<div class="ttc" id="aconstants_8h_html_ad71e4756e3bc5a1125ca086587286600"><div class="ttname"><a href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">CECIES_X25519_KEY_SIZE</a></div><div class="ttdeci">#define CECIES_X25519_KEY_SIZE</div><div class="ttdef"><b>Definition:</b> constants.h:38</div></div>
+<div class="ttc" id="aconstants_8h_html_ad71e4756e3bc5a1125ca086587286600"><div class="ttname"><a href="constants_8h.html#ad71e4756e3bc5a1125ca086587286600">CECIES_X25519_KEY_SIZE</a></div><div class="ttdeci">#define CECIES_X25519_KEY_SIZE</div><div class="ttdef"><b>Definition:</b> constants.h:43</div></div>
 <div class="ttc" id="autil_8h_html_ac18593b2c57aefd5682a3ca2167e6918"><div class="ttname"><a href="util_8h.html#ac18593b2c57aefd5682a3ca2167e6918">cecies_disable_fprintf</a></div><div class="ttdeci">void cecies_disable_fprintf()</div></div>
-<div class="ttc" id="aconstants_8h_html_a038c483a06eaff1b607b5720d51cd7ca"><div class="ttname"><a href="constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca">CECIES_X448_KEY_SIZE</a></div><div class="ttdeci">#define CECIES_X448_KEY_SIZE</div><div class="ttdef"><b>Definition:</b> constants.h:43</div></div>
+<div class="ttc" id="aconstants_8h_html_a038c483a06eaff1b607b5720d51cd7ca"><div class="ttname"><a href="constants_8h.html#a038c483a06eaff1b607b5720d51cd7ca">CECIES_X448_KEY_SIZE</a></div><div class="ttdeci">#define CECIES_X448_KEY_SIZE</div><div class="ttdef"><b>Definition:</b> constants.h:48</div></div>
 <div class="ttc" id="autil_8h_html_afccad4d81076bc94026ff47bf99c582a"><div class="ttname"><a href="util_8h.html#afccad4d81076bc94026ff47bf99c582a">cecies_get_random_big_integer</a></div><div class="ttdeci">static unsigned long long int cecies_get_random_big_integer()</div><div class="ttdef"><b>Definition:</b> util.h:179</div></div>
 <div class="ttc" id="autil_8h_html_a4a3207be38324b7f2353cb5650157fe4"><div class="ttname"><a href="util_8h.html#a4a3207be38324b7f2353cb5650157fe4">cecies_dev_urandom</a></div><div class="ttdeci">static void cecies_dev_urandom(unsigned char *output_buffer, const size_t output_buffer_size)</div><div class="ttdef"><b>Definition:</b> util.h:190</div></div>
 <div class="ttc" id="aconstants_8h_html"><div class="ttname"><a href="constants_8h.html">constants.h</a></div><div class="ttdoc">CECIES constants.</div></div>