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
2 changes: 1 addition & 1 deletion icc/ICCPKG.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Make file for ICCPKG components
#

iccpkg: ICC_ver.txt $(ICC_ROOT)/package/ICCPKG.tar \
iccpkg: ICC_ver.txt $(ICC_ROOT)/package/ICCPKG.tar \
$(ICC_ROOT)/package/gsk_crypto.tar $(ICC_ROOT)/package/gsk_crypto_sdk.tar \
$(ICC_ROOT)/package/jgsk_crypto.tar $(ICC_ROOT)/package/jgsk_crypto_sdk.tar

Expand Down
50 changes: 25 additions & 25 deletions icc/ICCencapsulator.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ else if ( func.argumenttypes[i].indexOf("const") >= 0 ) {
else {
found = false;
break;
}
}
}

}
Expand Down Expand Up @@ -523,7 +523,7 @@ class FileType {
public String prefix = "";
FileWriter writer;
public String name = "";
static final String copyrightheader =
static final String copyrightheader =
"/*\n"+
"** Machine generated code: DO NOT EDIT\n"+
"**\n"+
Expand Down Expand Up @@ -1100,8 +1100,8 @@ class File_ICC_A_H extends FileType {

public void Preamble() throws Exception {
super.Preamble();
writer.write("/*\n" + "* Function prototypes for the ICC API (ICCSDK).\n"
+ "* This file is autogenerated and should only be included via icc.h.\n" + "*/\n\n");
writer.write("/*\n" + "* Function prototypes for the ICC API (ICCSDK ICC module library)\n"
+ "* This file is autogenerated and should only be included via icc.h\n" + "*/\n");

writer.write("\n#ifndef INCLUDED_ICC_A\n#define INCLUDED_ICC_A\n");

Expand Down Expand Up @@ -1422,7 +1422,7 @@ public void Preamble() throws Exception {
pcbtype = ICCencapsulator.ICCPCB;

super.Preamble();
writer.write("/*\n" + "* Function prototypes for the ICC API (ICCSDK)\n"
writer.write("/*\n" + "* Function prototypes for the ICC API (ICCPKGSDK ICC step library)\n"
+ "* This file is autogenerated and should only be included via icc.h\n" + "*/\n");

writer.write("\n#ifndef INCLUDED_ICC_A\n#define INCLUDED_ICC_A\n\n");
Expand Down Expand Up @@ -1572,8 +1572,8 @@ public void Body(ICCFunction func) throws Exception
writer.write(";\n");
if(func.isLegacy(this)) {
writer.write("#if defined(HAVE_C_ICC)\n");
func.WriteFunction(writer,ICCencapsulator.ALT_ICCPrefix,pcbtype);
writer.write(";\n");
func.WriteFunction(writer,ICCencapsulator.ALT_ICCPrefix,pcbtype);
writer.write(";\n");
writer.write("#endif\n");
}
// Is documentation available for the entry point, if so add it so GSkit's doxygen can pick it up ?
Expand Down Expand Up @@ -1618,16 +1618,16 @@ public void Body(ICCFunction func) throws Exception
writer.write("\n\t\t}\n");
if(func.isLegacy(this)) {
writer.write("#if defined(HAVE_C_ICC)\n");
writer.write("\t\tif(NULL != wpcb->Cctx) {\n");
{
writer.write("\t\tif(NULL != wpcb->Cctx) {\n");
{

writer.write("\t\t\t");
if (! func.returntype.equals("void")) {
writer.write("return ");
}
func.WriteCallingFunction(writer,ICCencapsulator.ALT_ICCPrefix,"(wpcb->Cctx");
writer.write("\n\t\t}\n");
}
writer.write("\t\t\t");
if (! func.returntype.equals("void")) {
writer.write("return ");
}
func.WriteCallingFunction(writer,ICCencapsulator.ALT_ICCPrefix,"(wpcb->Cctx");
writer.write("\n\t\t}\n");
}
writer.write("#endif\n");
} else {
if( !func.returntype.equals("void") &&
Expand Down Expand Up @@ -2231,7 +2231,7 @@ public void fixTypes(FileType filetype)
// if we need to
int k = PrependWords.words().size();

switch (filetype.fn) {
switch(filetype.fn) {
case ICC_A_C:
case ICC_A_H:
case ICCPKG_A_C:
Expand Down Expand Up @@ -2745,17 +2745,17 @@ public String genReturnValue() {
// Encapsulates knowledges specific to a supported OS
class OS {
// Extra symbols required to be exported from the file GSkit creates
private static String GSKExports[] = {
private static String GSKExports[] = {
"C_GetFunctionList",
"gskiccs_SCCSInfo",
"gskiccs_Crypto_VersionInfo",
"gskiccs_path",
"gskiccs_SCCSInfo",
"gskiccs_Crypto_VersionInfo",
"gskiccs_path",
"gskiccs8_path",
"ICC_Init",
"Delta_T",
"Delta_res",
"Delta2Time",
"Delta_spanT",
"Delta_T",
"Delta_res",
"Delta2Time",
"Delta_spanT",
"Delta_spanC",
"ICC_MemCheck_start",
"ICC_MemCheck_stop" /*,
Expand Down
Loading
Loading