diff options
| -rw-r--r-- | libssh2-1.4.2-fips.patch | 30 | ||||
| -rw-r--r-- | libssh2.spec | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/libssh2-1.4.2-fips.patch b/libssh2-1.4.2-fips.patch index e45d794..38d49af 100644 --- a/libssh2-1.4.2-fips.patch +++ b/libssh2-1.4.2-fips.patch @@ -302,3 +302,33 @@ index 4835ab6..6f21a1a 100644 -- 1.7.1 +From fe8f3deb480d1fcef0d720e6b9acabbd640fe7c3 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka@redhat.com> +Date: Thu, 1 Nov 2012 14:57:06 +0100 +Subject: [PATCH] libssh2_hostkey_hash.3: update the description of return value + +The function returns NULL also if the hash algorithm is not available. +--- + docs/libssh2_hostkey_hash.3 | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/docs/libssh2_hostkey_hash.3 b/docs/libssh2_hostkey_hash.3 +index f78831c..c2f1644 100644 +--- a/docs/libssh2_hostkey_hash.3 ++++ b/docs/libssh2_hostkey_hash.3 +@@ -18,8 +18,9 @@ Returns the computed digest of the remote system's hostkey. The length of + the returned string is hash_type specific (e.g. 16 bytes for MD5, + 20 bytes for SHA1). + .SH RETURN VALUE +-Computed hostkey hash value. or NULL if the session has not yet been started +-up. (The hash consists of raw binary bytes, not hex digits, so is not +-directly printable.) ++Computed hostkey hash value, or NULL if the information is not available ++(either the session has not yet been started up, or the requested hash ++algorithm was not available). The hash consists of raw binary bytes, not hex ++digits, so it is not directly printable. + .SH SEE ALSO + .BR libssh2_session_init_ex(3) +-- +1.7.1 + diff --git a/libssh2.spec b/libssh2.spec index 5c25b39..cff63e8 100644 --- a/libssh2.spec +++ b/libssh2.spec @@ -138,6 +138,7 @@ rm -rf %{buildroot} %changelog * Wed Nov 07 2012 Kamil Dudka <kdudka@redhat.com> 1.4.2-4 - examples: use stderr for messages, stdout for data (upstream commit b31e35ab) +- update libssh2_hostkey_hash(3) man page (upstream commit fe8f3deb) * Wed Sep 26 2012 Kamil Dudka <kdudka@redhat.com> 1.4.2-3 - fix basic functionality of libssh2 in FIPS mode |