Merge pull request #129 from cconlon/aesModes

Add AES-ECB/CTR/OFB/CCM/CMAC/GMAC

Author: rlm2002

.github/workflows/line-length-check.yml

@@ -38,20 +38,52 @@ jobs:
         # Check each changed file
         while IFS= read -r file; do
           if [[ -f "$file" ]]; then
+            # Skip WolfCryptProvider.java as it contains service mappings
+            # that legitimately exceed 80 characters
+            if [[ "$file" == "src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java" ]]; then
+              echo "⚠️ Skipping $file (contains security service mappings)"
+              continue
+            fi
+
             echo "Checking: $file"
 
-            # Get added lines with line numbers and check their length
+            # Get added lines with actual file line numbers and check their length
+            new_line_num=0
             git diff "origin/$BASE_BRANCH"...HEAD "$file" | \
-              grep -n -E '^\+[^+]' | \
-              while IFS=':' read -r line_num added_line; do
-                # Remove the leading +
-                actual_line="${added_line:1}"
-                char_count=${#actual_line}
+              while IFS= read -r line; do
+                # Track line numbers from diff headers - format: @@ -old_start,old_count +new_start,new_count @@
+                if [[ "$line" =~ ^@@.*\+([0-9]+) ]]; then
+                  # Extract starting line number for new file (after +)
+                  # Subtract 1 because we'll increment before processing first line
+                  new_line_num=$((${BASH_REMATCH[1]} - 1))
+                elif [[ "$line" =~ ^(\+[^+].*) ]]; then
+                  # This is an added line (not a +++ header)
+                  # Increment line number BEFORE processing (since this line exists in new file)
+                  new_line_num=$((new_line_num + 1))
+                  added_line="${line:1}"  # Remove leading +
+                  char_count=${#added_line}
 
-                if [[ $char_count -gt 80 ]]; then
-                  echo "❌ $file:$line_num - Line too long ($char_count characters)"
-                  echo "   Line: $actual_line"
-                  echo "violation" >> "$violations_file"
+                  # Skip JNI method signatures and calls to avoid false positives
+                  # These are auto-generated names that can't be shortened
+                  if [[ $char_count -gt 80 ]]; then
+                    # Check if this is a JNI method signature, call, or parameter line that should be ignored
+                    if [[ "$added_line" =~ JNIEXPORT.*JNICALL.*Java_com_wolfssl_ ]] || \
+                       [[ "$added_line" =~ Java_com_wolfssl_.*\( ]] || \
+                       [[ "$added_line" =~ ^[[:space:]]*return[[:space:]]+Java_com_wolfssl_.* ]] || \
+                       [[ "$added_line" =~ ^[[:space:]]*\(JNIEnv\*[[:space:]]+env.*\) ]] || \
+                       [[ "$added_line" =~ ^[[:space:]]*JNIEnv\*[[:space:]]+env.* ]]; then
+                      echo "⚠️ $file:$new_line_num - Skipping JNI method signature/call/parameters ($char_count characters)"
+                      echo "   Line: $added_line"
+                    else
+                      echo "❌ $file:$new_line_num - Line too long ($char_count characters)"
+                      echo "   Line: $added_line"
+                      echo "violation" >> "$violations_file"
+                    fi
+                  fi
+                elif [[ "$line" =~ ^[[:space:]] ]]; then
+                  # Context line (unchanged) - increment new file line number
+                  new_line_num=$((new_line_num + 1))
+                # Removed lines (starting with -) don't affect new file line numbers
                 fi
               done
           fi

README_JCE.md

@@ -104,12 +104,19 @@ The JCE provider currently supports the following algorithms:
     Cipher Class
         AES/CBC/NoPadding
         AES/CBC/PKCS5Padding
+        AES/CCM/NoPadding
+        AES/CTR/NoPadding
+        AES/ECB/NoPadding
+        AES/ECB/PKCS5Padding
         AES/GCM/NoPadding
+        AES/OFB/NoPadding
         DESede/CBC/NoPadding
         RSA
         RSA/ECB/PKCS1Padding
 
     Mac Class
+        AESCMAC (aliased also as: AES-CMAC)
+        AESGMAC (aliased also as: AES-GMAC)
         HmacMD5
         HmacSHA1
         HmacSHA224