diff options
| author | Jack Lloyd <[email protected]> | 2019-12-14 12:45:36 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-12-14 12:45:36 -0500 |
| commit | 2e1540735713d17d4c736ca288765f3e26f03416 (patch) | |
| tree | 46356394dc876448cb07dd7b87ef79ee9c283cce | |
| parent | d620908c0b96e79020dcb9d5e7b1d4f91adc490f (diff) | |
Bump the FFI version due to addition of CRL support
| -rw-r--r-- | doc/api_ref/ffi.rst | 1 | ||||
| -rw-r--r-- | src/lib/ffi/ffi.cpp | 4 | ||||
| -rw-r--r-- | src/lib/ffi/info.txt | 2 | ||||
| -rwxr-xr-x | src/python/botan2.py | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/doc/api_ref/ffi.rst b/doc/api_ref/ffi.rst index bec0f5503..f3274c4d6 100644 --- a/doc/api_ref/ffi.rst +++ b/doc/api_ref/ffi.rst @@ -162,6 +162,7 @@ supported it. ============== =================== FFI Version Supported Starting ============== =================== +20191214 2.13.0 20180713 2.8.0 20170815 2.3.0 20170327 2.1.0 diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp index 4600d5785..257871a61 100644 --- a/src/lib/ffi/ffi.cpp +++ b/src/lib/ffi/ffi.cpp @@ -200,6 +200,10 @@ uint32_t botan_ffi_api_version() int botan_ffi_supports_api(uint32_t api_version) { + // This is the API introduced in 2.13 + if(api_version == 20191214) + return BOTAN_FFI_SUCCESS; + // This is the API introduced in 2.8 if(api_version == 20180713) return BOTAN_FFI_SUCCESS; diff --git a/src/lib/ffi/info.txt b/src/lib/ffi/info.txt index eac2cc82a..3de60322e 100644 --- a/src/lib/ffi/info.txt +++ b/src/lib/ffi/info.txt @@ -1,5 +1,5 @@ <defines> -FFI -> 20180713 +FFI -> 20191214 </defines> <header:internal> diff --git a/src/python/botan2.py b/src/python/botan2.py index ee8baa296..4cae19d1a 100755 --- a/src/python/botan2.py +++ b/src/python/botan2.py @@ -26,7 +26,7 @@ from time import strptime, mktime, time as system_time from binascii import hexlify from datetime import datetime -BOTAN_FFI_VERSION = 20180713 +BOTAN_FFI_VERSION = 20191214 # # Base exception for all exceptions raised from this module @@ -61,7 +61,7 @@ def _load_botan_dll(expected_version): else: # assumed to be some Unix/Linux system possible_dll_names.append('libbotan-2.so') - possible_dll_names += ['libbotan-2.so.%d' % (v) for v in reversed(range(8, 16))] + possible_dll_names += ['libbotan-2.so.%d' % (v) for v in reversed(range(13, 20))] for dll_name in possible_dll_names: try: |