Remove some duplicated code

Author: dirkx

libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/HttpBasicAuthSHA1orBearerToken.ino

@@ -80,21 +80,11 @@ void setup() {
   }
   ArduinoOTA.begin();
 
-
   // Convert token to a convenient binary representation.
   //
-  if (secret_token_hex.length() != 2 * 20) {
-    Serial.println("Bearer token does not look like a hex string ?!");
-  }
-
-  #define _H2D(x) (((x)>='0' && ((x) <='9')) ? ((x)-'0') : (((x)>='a' && (x)<='f') ? ((x)-'a'+10) : 0))
-  #define H2D(x) (_H2D(tolower((x))))
-  const char * _shaBase64 = secret_token_hex.c_str();
-  for (int i = 0; i < 20; i++) {
-    unsigned char c = _shaBase64[2 * i + 0];
-    unsigned char d = _shaBase64[2 * i + 1];
-    _bearer[i] = (H2D(c) << 4) | H2D(d);
-  };
+  size_t len = HEXBuilder::hex2bytes(_bearer,sizeof(_bearer),secret_token_hex);
+  if (len != 20) 
+    Serial.println("Bearer token does not look like a valid SHA1 hex string ?!");
 
   server.on("/", []() {
     if (!server.authenticate(&check_bearer_or_auth)) {
@@ -116,4 +106,4 @@ void loop() {
   ArduinoOTA.handle();
   server.handleClient();
   delay(2);//allow the cpu to switch to other tasks
-}
+}

libraries/WebServer/src/WebServer.cpp

@@ -28,6 +28,7 @@
 #include "WiFiServer.h"
 #include "WiFiClient.h"
 #include "WebServer.h"
+#include "HEXBuilder.h"
 #include "FS.h"
 #include "detail/RequestHandlersImpl.h"
 #include "mbedtls/md5.h"
@@ -164,12 +165,7 @@ bool WebServer::authenticateBasicSHA1(const char * _username, const char * _sha1
             #define _H2D(x) (((x)>='0' && ((x) <='9')) ? ((x)-'0') : (((x)>='a' && (x)<='f') ? ((x)-'a'+10) : 0))
             #define H2D(x) (_H2D(tolower((x))))
             if (strlen(_sha1Base64orHex) == 20 * 2) {
-                for(int i = 0; i < 20; i++) {
-		    unsigned char c = _sha1Base64orHex[2*i];
-		    unsigned char d = _sha1Base64orHex[2*i+1];
-                    sha1calc[i] = (H2D(c)<<4) | H2D(d);
-                };
-                ret = 0;
+                HEXBuilder::bytes2hex(sha1calc,sizeof(sha1calc),sha1,sizeof(sha1));
             } else
                 ret = mbedtls_base64_encode((uint8_t*)sha1calc, sizeof(sha1calc), &olen, sha1, sizeof(sha1));