diff --git a/LICENSE.md b/LICENSE.md index b0c13253..f51d1938 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -8,7 +8,6 @@ Either Apache License, Version 2.0 or GNU General Public License Version 3. You choose. Except as otherwise noted, -- see lib/src/clixon_sha1.c - see apps/restconf/libevhtp_parser.[ch] BSD 3-clause: Copyright (c) 2010-2018, Mark Ellzey, Nathan French, Marcus Sundberg diff --git a/apps/netconf/netconf_lib.c b/apps/netconf/netconf_lib.c index ebbe43cb..286ffa4b 100644 --- a/apps/netconf/netconf_lib.c +++ b/apps/netconf/netconf_lib.c @@ -78,9 +78,11 @@ int cc_closed = 0; /* XXX Please remove (or at least hide in handle) this global int add_preamble(cbuf *cb) { +#ifdef NOTUSED if (transport == NETCONF_SOAP) cprintf(cb, "\n\n" ""); +#endif return 0; } @@ -95,9 +97,11 @@ add_postamble(cbuf *cb) case NETCONF_SSH: cprintf(cb, "]]>]]>"); /* Add RFC4742 end-of-message marker */ break; +#ifdef NOTUSED case NETCONF_SOAP: cprintf(cb, "\n" ""); break; +#endif } return 0; } @@ -112,6 +116,7 @@ add_error_preamble(cbuf *cb, char *reason) { switch (transport){ +#ifdef NOTUSED case NETCONF_SOAP: cprintf(cb, "" "" @@ -124,6 +129,7 @@ add_error_preamble(cbuf *cb, "" "", reason); break; +#endif default: if (add_preamble(cb) < 0) return -1; @@ -141,8 +147,10 @@ int add_error_postamble(cbuf *cb) { switch (transport){ +#ifdef NOTUSED case NETCONF_SOAP: cprintf(cb, "" ""); +#endif default: /* fall through */ if (add_postamble(cb) < 0) return -1; @@ -151,34 +159,6 @@ add_error_postamble(cbuf *cb) return 0; } - -/*! Get "target" attribute, return actual database given candidate or running - * Caller must do error handling - * @param[in] xn XML tree - * @param[in] path - * @retval dbname Actual database file name - */ -char * -netconf_get_target(cxobj *xn, - char *path) -{ - cxobj *x; - char *target = NULL; - - if ((x = xpath_first(xn, NULL, "%s", path)) != NULL){ - if (xpath_first(x, NULL, "candidate") != NULL) - target = "candidate"; - else - if (xpath_first(x, NULL, "running") != NULL) - target = "running"; - else - if (xpath_first(x, NULL, "startup") != NULL) - target = "startup"; - } - return target; - -} - /*! Send netconf message from cbuf on socket * @param[in] s * @param[in] cb Cligen buffer that contains the XML message diff --git a/apps/netconf/netconf_lib.h b/apps/netconf/netconf_lib.h index f9b82d47..ce1c882f 100644 --- a/apps/netconf/netconf_lib.h +++ b/apps/netconf/netconf_lib.h @@ -48,7 +48,9 @@ enum target_type{ /* netconf */ }; enum transport_type{ NETCONF_SSH, /* RFC 4742 */ +#ifdef NOTUSED NETCONF_SOAP, /* RFC 4743 */ +#endif }; enum test_option{ /* edit-config */ @@ -74,7 +76,6 @@ extern int cc_closed; int add_preamble(cbuf *xf); int add_postamble(cbuf *xf); int add_error_preamble(cbuf *xf, char *reason); -char *netconf_get_target(cxobj *xn, char *path); int add_error_postamble(cbuf *xf); int netconf_output(int s, cbuf *xf, char *msg); int netconf_output_encap(int s, cbuf *cb, char *msg); diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c index 5a19b6db..bfcd81ea 100644 --- a/apps/restconf/restconf_main_native.c +++ b/apps/restconf/restconf_main_native.c @@ -1253,7 +1253,7 @@ restconf_accept_client(int fd, /* * Register callbacks for actual data socket */ -#ifdef LIBEVENT_POS_PATCH +#ifdef RESTCONF_LIBEVENT_POS_PATCH /* patch to keep track os position in output buffer * cannot use drain/copyout since the start position is "freezed" in bufferevent_socket_new */ diff --git a/lib/clixon/clixon_sha1.h b/lib/clixon/clixon_sha1.h deleted file mode 100644 index 46212691..00000000 --- a/lib/clixon/clixon_sha1.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _CLIXON_SHA1_H_ -#define _CLIXON_SHA1_H_ - -/* - * Function Prototypes - */ -char *clicon_sha1hex(const char *str); - -#endif /* _CLIXON_SHA1_H_ */ diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in index 324b666e..2032239a 100644 --- a/lib/src/Makefile.in +++ b/lib/src/Makefile.in @@ -81,7 +81,7 @@ SRC = clixon_sig.c clixon_uid.c clixon_log.c clixon_err.c clixon_event.c \ clixon_hash.c clixon_options.c clixon_data.c clixon_plugin.c \ clixon_proto.c clixon_proto_client.c \ clixon_xpath.c clixon_xpath_ctx.c clixon_xpath_eval.c clixon_xpath_function.c clixon_xpath_optimize.c \ - clixon_sha1.c clixon_datastore.c clixon_datastore_write.c clixon_datastore_read.c \ + clixon_datastore.c clixon_datastore_write.c clixon_datastore_read.c \ clixon_netconf_lib.c clixon_stream.c clixon_nacm.c clixon_client.c clixon_netns.c YACCOBJS = lex.clixon_xml_parse.o clixon_xml_parse.tab.o \ diff --git a/lib/src/clixon_sha1.c b/lib/src/clixon_sha1.c deleted file mode 100644 index 3bb7596a..00000000 --- a/lib/src/clixon_sha1.c +++ /dev/null @@ -1,448 +0,0 @@ -/* - * sha1.c - * - * Copyright (C) 1998, 2009 - * Paul E. Jones - * All Rights Reserved - * - * Freeware Public License (FPL) - * - * This software is licensed as "freeware." Permission to distribute - * this software in source and binary forms, including incorporation - * into other products, is hereby granted without a fee. THIS SOFTWARE - * IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHOR SHALL NOT BE HELD - * LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER - * DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA - * OR DATA BEING RENDERED INACCURATE. - * - ***************************************************************************** - * $Id: sha1.c 12 2009-06-22 19:34:25Z paulej $ - ***************************************************************************** - * - * Description: - * This file implements the Secure Hashing Standard as defined - * in FIPS PUB 180-1 published April 17, 1995. - * - * The Secure Hashing Standard, which uses the Secure Hashing - * Algorithm (SHA), produces a 160-bit message digest for a - * given data stream. In theory, it is highly improbable that - * two messages will produce the same message digest. Therefore, - * this algorithm can serve as a means of providing a "fingerprint" - * for a message. - * - * Portability Issues: - * SHA-1 is defined in terms of 32-bit "words". This code was - * written with the expectation that the processor has at least - * a 32-bit machine word size. If the machine word size is larger, - * the code should still function properly. One caveat to that - * is that the input functions taking characters and character - * arrays assume that only 8 bits of information are stored in each - * character. - * - * Caveats: - * SHA-1 is designed to work with messages less than 2^64 bits - * long. Although SHA-1 allows a message digest to be generated for - * messages of any number of bits less than 2^64, this - * implementation only works with messages with a length that is a - * multiple of the size of an 8-bit character. - * - */ -#include -#include -#include -#include - -/* cligen */ -#include - -/* clicon */ -#include "clixon_log.h" -#include "clixon_err.h" - - -/* - * This structure will hold context information for the hashing - * operation - */ -typedef struct SHA1Context -{ - uint32_t Message_Digest[5]; /* Message Digest (output) */ - - uint32_t Length_Low; /* Message length in bits */ - uint32_t Length_High; /* Message length in bits */ - - unsigned char Message_Block[64]; /* 512-bit message blocks */ - int Message_Block_Index; /* Index into message block array */ - - int Computed; /* Is the digest computed? */ - int Corrupted; /* Is the message digest corruped? */ -} SHA1Context; - - -/* - * Define the circular shift macro - */ -#define SHA1CircularShift(bits,word) \ - ((((word) << (bits)) & 0xFFFFFFFF) | \ - ((word) >> (32-(bits)))) - -/* Function prototypes */ -static void SHA1ProcessMessageBlock(SHA1Context *); -static void SHA1PadMessage(SHA1Context *); -static void SHA1Reset(SHA1Context *); -static int SHA1Result(SHA1Context *); -static void SHA1Input( SHA1Context *, const unsigned char *, uint32_t); - -/* - * SHA1Reset - * - * Description: - * This function will initialize the SHA1Context in preparation - * for computing a new message digest. - * - * Parameters: - * context: [in/out] - * The context to reset. - * - * Returns: - * Nothing. - * - * Comments: - * - */ -static void -SHA1Reset(SHA1Context *context) -{ - context->Length_Low = 0; - context->Length_High = 0; - context->Message_Block_Index = 0; - - context->Message_Digest[0] = 0x67452301; - context->Message_Digest[1] = 0xEFCDAB89; - context->Message_Digest[2] = 0x98BADCFE; - context->Message_Digest[3] = 0x10325476; - context->Message_Digest[4] = 0xC3D2E1F0; - - context->Computed = 0; - context->Corrupted = 0; -} - -/* - * SHA1Result - * - * Description: - * This function will return the 160-bit message digest into the - * Message_Digest array within the SHA1Context provided - * - * Parameters: - * context: [in/out] - * The context to use to calculate the SHA-1 hash. - * - * Returns: - * 1 if successful, 0 if it failed. - * - * Comments: - * - */ -static int -SHA1Result(SHA1Context *context) -{ - - if (context->Corrupted) - { - return 0; - } - - if (!context->Computed) - { - SHA1PadMessage(context); - context->Computed = 1; - } - - return 1; -} - -/* - * SHA1Input - * - * Description: - * This function accepts an array of octets as the next portion of - * the message. - * - * Parameters: - * context: [in/out] - * The SHA-1 context to update - * message_array: [in] - * An array of characters representing the next portion of the - * message. - * length: [in] - * The length of the message in message_array - * - * Returns: - * Nothing. - * - * Comments: - * - */ -static void -SHA1Input( SHA1Context *context, - const unsigned char *message_array, - uint32_t length) -{ - if (!length) - { - return; - } - - if (context->Computed || context->Corrupted) - { - context->Corrupted = 1; - return; - } - - while(length-- && !context->Corrupted) - { - context->Message_Block[context->Message_Block_Index++] = - (*message_array & 0xFF); - - context->Length_Low += 8; - /* Force it to 32 bits */ - context->Length_Low &= 0xFFFFFFFF; - if (context->Length_Low == 0) - { - context->Length_High++; - /* Force it to 32 bits */ - context->Length_High &= 0xFFFFFFFF; - if (context->Length_High == 0) - { - /* Message is too long */ - context->Corrupted = 1; - } - } - - if (context->Message_Block_Index == 64) - { - SHA1ProcessMessageBlock(context); - } - - message_array++; - } -} - -/* - * SHA1ProcessMessageBlock - * - * Description: - * This function will process the next 512 bits of the message - * stored in the Message_Block array. - * - * Parameters: - * None. - * - * Returns: - * Nothing. - * - * Comments: - * Many of the variable names in the SHAContext, especially the - * single character names, were used because those were the names - * used in the publication. - * - * - */ -static void -SHA1ProcessMessageBlock(SHA1Context *context) -{ - const uint32_t K[] = /* Constants defined in SHA-1 */ - { - 0x5A827999, - 0x6ED9EBA1, - 0x8F1BBCDC, - 0xCA62C1D6 - }; - int t; /* Loop counter */ - uint32_t temp; /* Temporary word value */ - uint32_t W[80]; /* Word sequence */ - uint32_t A, B, C, D, E; /* Word buffers */ - - /* - * Initialize the first 16 words in the array W - */ - for(t = 0; t < 16; t++) - { - W[t] = ((uint32_t) context->Message_Block[t * 4]) << 24; - W[t] |= ((uint32_t) context->Message_Block[t * 4 + 1]) << 16; - W[t] |= ((uint32_t) context->Message_Block[t * 4 + 2]) << 8; - W[t] |= ((uint32_t) context->Message_Block[t * 4 + 3]); - } - - for(t = 16; t < 80; t++) - { - W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]); - } - - A = context->Message_Digest[0]; - B = context->Message_Digest[1]; - C = context->Message_Digest[2]; - D = context->Message_Digest[3]; - E = context->Message_Digest[4]; - - for(t = 0; t < 20; t++) - { - temp = SHA1CircularShift(5,A) + - ((B & C) | ((~B) & D)) + E + W[t] + K[0]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = SHA1CircularShift(30,B); - B = A; - A = temp; - } - - for(t = 20; t < 40; t++) - { - temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = SHA1CircularShift(30,B); - B = A; - A = temp; - } - - for(t = 40; t < 60; t++) - { - temp = SHA1CircularShift(5,A) + - ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = SHA1CircularShift(30,B); - B = A; - A = temp; - } - - for(t = 60; t < 80; t++) - { - temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3]; - temp &= 0xFFFFFFFF; - E = D; - D = C; - C = SHA1CircularShift(30,B); - B = A; - A = temp; - } - - context->Message_Digest[0] = - (context->Message_Digest[0] + A) & 0xFFFFFFFF; - context->Message_Digest[1] = - (context->Message_Digest[1] + B) & 0xFFFFFFFF; - context->Message_Digest[2] = - (context->Message_Digest[2] + C) & 0xFFFFFFFF; - context->Message_Digest[3] = - (context->Message_Digest[3] + D) & 0xFFFFFFFF; - context->Message_Digest[4] = - (context->Message_Digest[4] + E) & 0xFFFFFFFF; - - context->Message_Block_Index = 0; -} - -/* - * SHA1PadMessage - * - * Description: - * According to the standard, the message must be padded to an even - * 512 bits. The first padding bit must be a '1'. The last 64 - * bits represent the length of the original message. All bits in - * between should be 0. This function will pad the message - * according to those rules by filling the Message_Block array - * accordingly. It will also call SHA1ProcessMessageBlock() - * appropriately. When it returns, it can be assumed that the - * message digest has been computed. - * - * Parameters: - * context: [in/out] - * The context to pad - * - * Returns: - * Nothing. - * - * Comments: - * - */ -static void -SHA1PadMessage(SHA1Context *context) -{ - /* - * Check to see if the current message block is too small to hold - * the initial padding bits and length. If so, we will pad the - * block, process it, and then continue padding into a second - * block. - */ - if (context->Message_Block_Index > 55) - { - context->Message_Block[context->Message_Block_Index++] = 0x80; - while(context->Message_Block_Index < 64) - { - context->Message_Block[context->Message_Block_Index++] = 0; - } - - SHA1ProcessMessageBlock(context); - - while(context->Message_Block_Index < 56) - { - context->Message_Block[context->Message_Block_Index++] = 0; - } - } - else - { - context->Message_Block[context->Message_Block_Index++] = 0x80; - while(context->Message_Block_Index < 56) - { - context->Message_Block[context->Message_Block_Index++] = 0; - } - } - - /* - * Store the message length as the last 8 octets - */ - context->Message_Block[56] = (context->Length_High >> 24) & 0xFF; - context->Message_Block[57] = (context->Length_High >> 16) & 0xFF; - context->Message_Block[58] = (context->Length_High >> 8) & 0xFF; - context->Message_Block[59] = (context->Length_High) & 0xFF; - context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF; - context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF; - context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF; - context->Message_Block[63] = (context->Length_Low) & 0xFF; - - SHA1ProcessMessageBlock(context); -} - - -char * -clicon_sha1hex(const char *str) -{ - int i; - char *retstr; - SHA1Context context; - - - SHA1Reset(&context); - SHA1Input(&context, (const unsigned char *)str, strlen(str)); - if (!SHA1Result(&context)) { - clicon_err(OE_UNIX, 0, "Could not compute SHA1 message digest"); - return NULL; - } - - /* 160 bits = 20 bytes = 40 hexdigits + '\0' */ - if ((retstr = malloc(41)) == NULL) { - clicon_err(OE_UNIX, errno, "malloc"); - return NULL; - } - - for(i = 0; i < 5 ; i++) - sprintf(retstr + (i*8), "%.8x", context.Message_Digest[i]); - - return retstr; -} diff --git a/test/test_debug.sh b/test/test_debug.sh index 41002849..046d68e8 100755 --- a/test/test_debug.sh +++ b/test/test_debug.sh @@ -63,7 +63,7 @@ if [ $BE -ne 0 ]; then start_backend -s init -f $cfg fi -new "waiting" +new "wait backend" wait_backend if [ $RC -ne 0 ]; then @@ -72,16 +72,16 @@ if [ $RC -ne 0 ]; then new "start restconf daemon" start_restconf -f $cfg - - new "waiting" - wait_restconf fi +new "wait restconf" +wait_restconf + new "Set backend debug using netconf" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO1]]>]]>" "^]]>]]>$" new "Set backend debug using restconf" -expectpart "$(curl $CURLOPTS -X POST -H 'Content-Type: application/yang-data+json' http://localhost/restconf/operations/clixon-lib:debug -d '{"clixon-lib:input":{"level":1}}')" 0 'HTTP/1.1 204 No Content' +expectpart "$(curl $CURLOPTS -X POST -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/operations/clixon-lib:debug -d '{"clixon-lib:input":{"level":1}}')" 0 'HTTP/1.1 204 No Content' new "Set restconf debug using netconf" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO1]]>]]>" "^]]>]]>$" @@ -90,7 +90,7 @@ new "netconf commit" expecteof "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO]]>]]>" "^]]>]]>$" new "Set restconf debug using restconf" -expectpart "$(curl $CURLOPTS -X PUT -H 'Content-Type: application/yang-data+json' http://localhost/restconf/data/clixon-restconf:restconf/debug -d '{"clixon-restconf:debug":1}')" 0 "HTTP/1.1 204 No Content" +expectpart "$(curl $CURLOPTS -X PUT -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/clixon-restconf:restconf/debug -d '{"clixon-restconf:debug":1}')" 0 "HTTP/1.1 204 No Content" new "Set cli debug using cli" expectpart "$($clixon_cli -1 -f $cfg -l o debug cli 1)" 0 "^$"