aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-11-06 17:09:46 +0100
committerAndreas Schneider <asn@cryptomilk.org>2013-11-06 17:11:25 +0100
commite52ff2c8ff44a8d62f1f78e38786546548778ea6 (patch)
treedc63b310d4074cfd1946babf43c2137a46bb3213
parent9bf9d52e21fc629140b27adb291a3d4e30b7122d (diff)
downloadlibssh-e52ff2c8ff44a8d62f1f78e38786546548778ea6.tar.gz
libssh-e52ff2c8ff44a8d62f1f78e38786546548778ea6.tar.xz
libssh-e52ff2c8ff44a8d62f1f78e38786546548778ea6.zip
dh: Move ssh_get_hexa() and ssh_print_hexa() down.
This way they are in the documentation block for the session and we get documentation for them.
-rw-r--r--src/dh.c114
1 files changed, 57 insertions, 57 deletions
diff --git a/src/dh.c b/src/dh.c
index c22c849f..5ebbc91e 100644
--- a/src/dh.c
+++ b/src/dh.c
@@ -239,63 +239,6 @@ void ssh_print_bignum(const char *which, bignum num) {
SAFE_FREE(hex);
}
-/**
- * @brief Convert a buffer into a colon separated hex string.
- * The caller has to free the memory.
- *
- * @param what What should be converted to a hex string.
- *
- * @param len Length of the buffer to convert.
- *
- * @return The hex string or NULL on error.
- *
- * @see ssh_string_free_char()
- */
-char *ssh_get_hexa(const unsigned char *what, size_t len) {
- const char h[] = "0123456789abcdef";
- char *hexa;
- size_t i;
- size_t hlen = len * 3;
-
- if (len > (UINT_MAX - 1) / 3) {
- return NULL;
- }
-
- hexa = malloc(hlen + 1);
- if (hexa == NULL) {
- return NULL;
- }
-
- for (i = 0; i < len; i++) {
- hexa[i * 3] = h[(what[i] >> 4) & 0xF];
- hexa[i * 3 + 1] = h[what[i] & 0xF];
- hexa[i * 3 + 2] = ':';
- }
- hexa[hlen - 1] = '\0';
-
- return hexa;
-}
-
-/**
- * @brief Print a buffer as colon separated hex string.
- *
- * @param descr Description printed in front of the hex string.
- *
- * @param what What should be converted to a hex string.
- *
- * @param len Length of the buffer to convert.
- */
-void ssh_print_hexa(const char *descr, const unsigned char *what, size_t len) {
- char *hexa = ssh_get_hexa(what, len);
-
- if (hexa == NULL) {
- return;
- }
- printf("%s: %s\n", descr, hexa);
-
- free(hexa);
-}
-
int dh_generate_x(ssh_session session) {
session->next_crypto->x = bignum_new();
if (session->next_crypto->x == NULL) {
@@ -1225,6 +1168,63 @@ out:
return rc;
}
+/**
+ * @brief Convert a buffer into a colon separated hex string.
+ * The caller has to free the memory.
+ *
+ * @param what What should be converted to a hex string.
+ *
+ * @param len Length of the buffer to convert.
+ *
+ * @return The hex string or NULL on error.
+ *
+ * @see ssh_string_free_char()
+ */
+char *ssh_get_hexa(const unsigned char *what, size_t len) {
+ const char h[] = "0123456789abcdef";
+ char *hexa;
+ size_t i;
+ size_t hlen = len * 3;
+
+ if (len > (UINT_MAX - 1) / 3) {
+ return NULL;
+ }
+
+ hexa = malloc(hlen + 1);
+ if (hexa == NULL) {
+ return NULL;
+ }
+
+ for (i = 0; i < len; i++) {
+ hexa[i * 3] = h[(what[i] >> 4) & 0xF];
+ hexa[i * 3 + 1] = h[what[i] & 0xF];
+ hexa[i * 3 + 2] = ':';
+ }
+ hexa[hlen - 1] = '\0';
+
+ return hexa;
+}
+
+/**
+ * @brief Print a buffer as colon separated hex string.
+ *
+ * @param descr Description printed in front of the hex string.
+ *
+ * @param what What should be converted to a hex string.
+ *
+ * @param len Length of the buffer to convert.
+ */
+void ssh_print_hexa(const char *descr, const unsigned char *what, size_t len) {
+ char *hexa = ssh_get_hexa(what, len);
+
+ if (hexa == NULL) {
+ return;
+ }
+ printf("%s: %s\n", descr, hexa);
+
+ free(hexa);
+}
+
/** @} */
/* vim: set ts=4 sw=4 et cindent: */