Revert "Fixed problem with demo disconnecting from Solace, updated URL -> FQDN, and updated default port to ttyUSB2"

This reverts commit 4e0c292.

Author: blakeyjason

golang/src/tlsdemo/cmd/cmd_handler.go

@@ -56,7 +56,6 @@ func hdlDemo( Parameters []string, pConfig *Config_t ) error {
     opts.SetClientID("IoT-Device")
     opts.SetTLSConfig( pTlsConfig )
     opts.SetProtocolVersion( uint(4) ) // MQTT 3.1.1
-    opts.SetAutoReconnect( true )
 
     // Attempting to connect to the server for a number of times before asserting
     // that the connection failed

golang/src/tlsdemo/cmd/commands.go

@@ -276,7 +276,7 @@ func (priv *IoTPrivateKey_t) Sign(rand io.Reader, digest []byte, opts crypto.Sig
     // We decode the response from the command
     SignatureStr, err := ParseResponse( string(CommandOutput), PY_SIGNATURE_LABEL )
     if err != nil {
-        return nil, fmt.Errorf("Couldn't parse the FQDN: %s", err.Error())
+        return nil, fmt.Errorf("Couldn't parse the URL: %s", err.Error())
     }
 
     // The signature is returned as a base64 encoded string

golang/src/tlsdemo/cmd/configuration.go

@@ -34,7 +34,7 @@ var PY_MW_USB_PORT string
 const BUILD_DIR            = "BUILD_DIR" // Environment variable set by setenv.sh to reach Python functions
 const PY_RELATIVE_PATH     = "python/iot_mw.py"
 const PY_PUBKEY_LABEL      = "PublicKey"
-const PY_URL_LABEL         = "FQDN"
+const PY_URL_LABEL         = "URL"
 const PY_PORT_LABEL        = "Port"
 const PY_SIGNATURE_LABEL   = "Signature"
 const PY_CLIENT_CERT_LABEL = "ClientCert"

python/demo.py

@@ -104,10 +104,10 @@ def print_status(self):
     utils.getRandom,        \
     16 ) )
 
-# We test the 'getFqdnAndPort' function
+# We test the 'getUrlAndPort' function
 TestArray.append( TestCase(     \
-    "Testing 'getFqdnAndPort'",  \
-    utils.getFqdnAndPort  ) )
+    "Testing 'getUrlAndPort'",  \
+    utils.getUrlAndPort  ) )
 
 # We test the 'generateSignature', 'getCertificate' and
 # 'verifySignature' functions at the same time. First, we

python/iot_mw.py

@@ -44,8 +44,8 @@
 signCmd.add_argument('--tbs', action='store', type=str, dest='tbs', required=True, help="Base64 encoded string of data to be signed")
 signCmd.add_argument('--raw', action='store_true', dest='raw', default=False, help="If true, performs a raw signature (no hash)")
 
-# getFqdnAndPortCmd
-getFqdnAndPort = subparsers.add_parser('getFqdnAndPort', help='Retrieves the URL and the port of the server endpoint')
+# getUrlAndPortCmd
+getUrlAndPort = subparsers.add_parser('getUrlAndPort', help='Retrieves the URL and the port of the server endpoint')
 
 # getAllInfo
 getAllInfo = subparsers.add_parser('getAllInfo', help='Retrieves all the information required for establishing a TLS session and validates the cryptographic material provided by the SIM card')
@@ -96,12 +96,12 @@ def getAllInfoCmd():
     aspCert           = utils.getCertificate( utils.ASP_CERTIFICATE_ID )
     endpointSignature = base64.b64encode( utils.readAsn1File( utils.SERVER_ENDPOINT_HASH_ID ) )
     aspCertSignature  = base64.b64encode( utils.readAsn1File( utils.SERVER_CERT_HASH_ID ) )
-    URL, Port         = utils.getFqdnAndPort( IsSecure=True ) # Check 2
+    URL, Port         = utils.getUrlAndPort( IsSecure=True ) # Check 2
 
     # Then we start making some verifications:
     # 1 - Validate that the rootCert is self-signed and that it signs the subCert and that
     #     the subCert signs the client cert.
-    # 2 - Validate that the signature on the endpoint (Already done in getFqdnAndPort)
+    # 2 - Validate that the signature on the endpoint (Already done in getUrlAndPort)
     # 3 - Validate that the ASP certificate was signed by the subCert
     # 4 - Ensure that the client certificate is contained in the DNS's database
 
@@ -140,7 +140,7 @@ def getAllInfoCmd():
 
         # Once all the checks have been successfully completed, we return the information
         print("", flush=True)
-        print("FQDN: " + URL )
+        print("URL: " + URL )
         print("Port: " + str(Port))
         print("ClientCert: " + clientCert.decode("utf-8").replace("\n",""))
         print("AspCert: " + aspCert.decode("utf-8").replace("\n",""))
@@ -165,11 +165,11 @@ def getAllInfoCmd():
         print("", flush=True)
         print("PublicKey: " + utils.extractPubKeyFromCert(ClientCertificate).decode("utf-8").replace("\n",""))
 
-    elif args.command == "getFqdnAndPort":
+    elif args.command == "getUrlAndPort":
         utils.init()
-        URL, Port = utils.getFqdnAndPort()
+        URL, Port = utils.getUrlAndPort()
         print("", flush=True)
-        print("FQDN: " + URL)
+        print("URL: " + URL)
         print("Port: " + str(Port))
 
     elif args.command == "isProvisioned":

python/utils.py

@@ -20,8 +20,8 @@
 #   - getRandom
 #   - readAsn1File
 #   - getCertificate
-#   - getFqdnAndPort
-#   - verifyFqdnAndPort
+#   - getUrlAndPort
+#   - verifyUrlAndPort
 #   - generateSignature
 #   - generateRawSignature
 #   - init
@@ -104,7 +104,7 @@
 
 # This part is used to configure the port that will be used to communicate with
 # the modem. You can modify this string based on your connection with the modem.
-MODEM_PORT = "/dev/ttyUSB2"
+MODEM_PORT = "/dev/ttyUSB0"
 
 # This is just for esthetic purposes and defines how many PEM characters wide a
 # certificate will be.
@@ -124,7 +124,7 @@
 # EPHEMERAL_PUBLIC_KEY_ID  = 5 -> Needs to be generated (not planning on implementing that yet)
 ROOT_CERTIFICATE_ID        = 6
 CIRA_SUB_CERTIFICATE_ID    = 7
-SERVER_ENDPOINT_ID         = 8  # Retrieved with the function "getFqdnAndPort"
+SERVER_ENDPOINT_ID         = 8  # Retrieved with the function "getUrlAndPort"
 SERVER_ENDPOINT_HASH_ID    = 9
 SERVER_CERT_HASH_ID        = 10
 
@@ -689,7 +689,7 @@ def getCertificate( ContainerId ):
 # @return URL  string
 # @return Port string
 #******************************************************************************#
-def getFqdnAndPort( IsSecure=True ):
+def getUrlAndPort( IsSecure=True ):
 
     # We prepare the values for retrieving the certificate
     uJsonStrArray  = ( ctypes.c_uint8 * MAX_SIZE_URL_PORT )()
@@ -714,20 +714,17 @@ def getFqdnAndPort( IsSecure=True ):
 
     # We check to see if we can verify the signature of the endpoint.
     if IsSecure:
-        if not verifyFqdnAndPort( jsonString ):
-            raise Exception("Invalid FQDN and port number")
+        if not verifyUrlAndPort( jsonString ):
+            raise Exception("Invalid URL and port number")
         elif CPP_LOG_LEVEL <= LOG_LEVEL_NOTICE:
             # Note that we could make this logging better at the Python level
-            log( LOG_LEVEL_NOTICE, "The signature on the FQDN and port number is valid")
+            log( LOG_LEVEL_NOTICE, "The signature on the URL and port number is valid")
 
     # We transform the string into a JSON object
     jsonObject = json.loads( jsonString )
     URL        = jsonObject[URL_LABEL]
     Port       = jsonObject[PORT_LABEL]
 
-    print("GOT FQDN: " + URL);
-    print("GOT PORT: " + str(Port));
-
     return URL, Port
 
 #******************************************************************************#
@@ -739,7 +736,7 @@ def getFqdnAndPort( IsSecure=True ):
 # @return URL  string
 # @return Port string
 #******************************************************************************#
-def verifyFqdnAndPort( UrlAndPort ):
+def verifyUrlAndPort( UrlAndPort ):
 
     # We retrieve the signature and the certificate stored on the SIM card
     endpointSignature = base64.b64encode( readAsn1File( SERVER_ENDPOINT_HASH_ID ) )

run.sh

@@ -2,7 +2,7 @@
 
 SCRIPTDIR="$( cd "$(dirname "$0")" ; pwd -P )"
 
-PORT="/dev/ttyUSB2"
+PORT="/dev/ttyUSB0"
 
 if [[ -z "${BUILD_DIR}" ]]; then
   source "${SCRIPTDIR}/setenv.sh"