Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '26 13 * * 0'
- cron: '10 10 * * 1'

jobs:
analyze:
Expand All @@ -38,18 +38,21 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
Expand All @@ -67,4 +70,4 @@ jobs:
mvn compile

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
33 changes: 33 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Java CI with Maven

on: [push, pull_request]

jobs:
build:
strategy:
matrix:
java-version: [17]

runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up JDK ${{matrix.java-version}}
uses: actions/setup-java@v4
with:
distribution: temurin
cache: maven
java-version: ${{matrix.java-version}}

- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-m2-

- name: Run tests
run: mvn test
22 changes: 11 additions & 11 deletions src/main/java/net/sf/portecle/crypto/X509Ext.java
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ private String getPolicyConstraintsStringValue(byte[] bValue)
for (int i = 0, len = policyConstraints.size(); i < len; i++)
{
DERTaggedObject policyConstraint = (DERTaggedObject) policyConstraints.getObjectAt(i);
ASN1Integer skipCerts = new ASN1Integer(((DEROctetString) policyConstraint.getObject()).getOctets());
ASN1Integer skipCerts = new ASN1Integer(((DEROctetString) policyConstraint.getBaseObject()).getOctets());
int iSkipCerts = skipCerts.getValue().intValue();

switch (policyConstraint.getTagNo())
Expand Down Expand Up @@ -1203,18 +1203,18 @@ private String getLogotypeStringValue(byte[] bValue)
sb.append(RB.getString("CommunityLogos"));
// TODO
sb.append("<br>");
sb.append(stringify(derTag.getObject()));
sb.append(stringify(derTag.getBaseObject()));
break;
case 1:
sb.append("<ul><li>");
sb.append(RB.getString("IssuerLogo"));
DERTaggedObject ltInfo = (DERTaggedObject) derTag.getObject();
DERTaggedObject ltInfo = (DERTaggedObject) derTag.getBaseObject();
switch (ltInfo.getTagNo())
{
case 0: // LogotypeData
sb.append("<ul><li>");
sb.append("Data");
ASN1Sequence ltData = (ASN1Sequence) ltInfo.getObject();
ASN1Sequence ltData = (ASN1Sequence) ltInfo.getBaseObject();
if (ltData.size() > 0)
{
sb.append("<ul><li>");
Expand Down Expand Up @@ -1283,7 +1283,7 @@ private String getLogotypeStringValue(byte[] bValue)
case 1: // LogotypeReference
// TODO
sb.append("Reference: ");
sb.append(stringify(ltInfo.getObject()));
sb.append(stringify(ltInfo.getBaseObject()));
break;
default: // Unknown
sb.append(stringify(ltInfo));
Expand All @@ -1293,13 +1293,13 @@ private String getLogotypeStringValue(byte[] bValue)
sb.append(RB.getString("SubjectLogo"));
// TODO
sb.append("<br>");
sb.append(stringify(derTag.getObject()));
sb.append(stringify(derTag.getBaseObject()));
break;
case 3:
sb.append(RB.getString("OtherLogos"));
// TODO
sb.append("<br>");
sb.append(stringify(derTag.getObject()));
sb.append(stringify(derTag.getBaseObject()));
break;
default: // Unknown
sb.append(stringify(derTag));
Expand Down Expand Up @@ -1357,17 +1357,17 @@ private String getNovellSecurityAttributesStringValue(byte[] bValue)
*/

// Key quality
ASN1Sequence keyq = (ASN1Sequence) ((ASN1TaggedObject) glbs.getObjectAt(0)).getObject();
ASN1Sequence keyq = (ASN1Sequence) ((ASN1TaggedObject) glbs.getObjectAt(0)).getBaseObject();
sb.append("<li>").append(RB.getString("NovellKeyQuality"));
sb.append("<ul>").append(getNovellQualityAttr(keyq)).append("</ul></li>");

// Crypto process quality
ASN1Sequence cpq = (ASN1Sequence) ((ASN1TaggedObject) glbs.getObjectAt(1)).getObject();
ASN1Sequence cpq = (ASN1Sequence) ((ASN1TaggedObject) glbs.getObjectAt(1)).getBaseObject();
sb.append("<li>").append(RB.getString("NovellCryptoProcessQuality"));
sb.append("<ul>").append(getNovellQualityAttr(cpq)).append("</ul></li>");

// Certificate class
ASN1Sequence cclass = (ASN1Sequence) ((ASN1TaggedObject) glbs.getObjectAt(2)).getObject();
ASN1Sequence cclass = (ASN1Sequence) ((ASN1TaggedObject) glbs.getObjectAt(2)).getBaseObject();
sb.append("<li>").append(RB.getString("NovellCertClass"));
sb.append(": ");
BigInteger sv = ((ASN1Integer) cclass.getObjectAt(0)).getValue();
Expand Down Expand Up @@ -1994,7 +1994,7 @@ else if (obj instanceof ASN1TaggedObject)
{
ASN1TaggedObject tagObj = (ASN1TaggedObject) obj;
// Note: "[", _not_ '[' ...
return "[" + tagObj.getTagNo() + "] " + stringify(tagObj.getObject());
return "[" + tagObj.getTagNo() + "] " + stringify(tagObj.getBaseObject());
}
else if (obj instanceof ASN1Sequence)
{
Expand Down