Fix f_871

Author: yosuke-wolfssl

src/internal.c

@@ -4880,16 +4880,14 @@ static int ParseRSAPubKey(WOLFSSH *ssh,
     byte* n;
     word32 nSz;
     word32 pubKeyIdx = 0;
-    word32 scratch;
 
     ret = wc_InitRsaKey(&sigKeyBlock_ptr->sk.rsa.key, ssh->ctx->heap);
     if (ret != 0)
         ret = WS_RSA_E;
-    if (ret == 0)
-        ret = GetUint32(&scratch, pubKey, pubKeySz, &pubKeyIdx);
-    /* This is the algo name. */
+    /* Skip the algo name. */
+    if (ret == WS_SUCCESS)
+        ret = GetSkip(pubKey, pubKeySz, &pubKeyIdx);
     if (ret == WS_SUCCESS) {
-        pubKeyIdx += scratch;
         ret = GetUint32(&eSz, pubKey, pubKeySz, &pubKeyIdx);
         if (ret == WS_SUCCESS && eSz > pubKeySz - pubKeyIdx)
             ret = WS_BUFFER_E;
@@ -4932,7 +4930,6 @@ static int ParseECCPubKey(WOLFSSH *ssh,
     const byte* q;
     word32 qSz, pubKeyIdx = 0;
     int primeId = 0;
-    word32 scratch;
 
     ret = wc_ecc_init_ex(&sigKeyBlock_ptr->sk.ecc.key, ssh->ctx->heap,
                                  INVALID_DEVID);
@@ -4958,12 +4955,10 @@ static int ParseECCPubKey(WOLFSSH *ssh,
 
     /* Skip the curve name since we're getting it from the algo. */
     if (ret == WS_SUCCESS)
-        ret = GetUint32(&scratch, pubKey, pubKeySz, &pubKeyIdx);
+        ret = GetSkip(pubKey, pubKeySz, &pubKeyIdx);
 
-    if (ret == WS_SUCCESS) {
-        pubKeyIdx += scratch;
+    if (ret == WS_SUCCESS)
         ret = GetStringRef(&qSz, &q, pubKey, pubKeySz, &pubKeyIdx);
-    }
 
     if (ret == WS_SUCCESS) {
         ret = wc_ecc_import_x963_ex(q, qSz,