summaryrefslogtreecommitdiffstats
path: root/engines/ccgost
diff options
context:
space:
mode:
Diffstat (limited to 'engines/ccgost')
-rw-r--r--engines/ccgost/gost89.c3
-rw-r--r--engines/ccgost/gost_ctl.c2
-rw-r--r--engines/ccgost/gost_keywrap.c7
-rw-r--r--engines/ccgost/gost_keywrap.h7
-rw-r--r--engines/ccgost/gost_sign.c4
5 files changed, 13 insertions, 10 deletions
diff --git a/engines/ccgost/gost89.c b/engines/ccgost/gost89.c
index c1474cb652..2b6201bfd4 100644
--- a/engines/ccgost/gost89.c
+++ b/engines/ccgost/gost89.c
@@ -9,7 +9,8 @@
**********************************************************************/
#include <string.h>
#include "gost89.h"
-/* Substitution blocks from RFC 4357
+/*-
+ Substitution blocks from RFC 4357
Note: our implementation of gost 28147-89 algorithm
uses S-box matrix rotated 90 degrees counterclockwise, relative to
diff --git a/engines/ccgost/gost_ctl.c b/engines/ccgost/gost_ctl.c
index d3cd171818..4b0fa19ade 100644
--- a/engines/ccgost/gost_ctl.c
+++ b/engines/ccgost/gost_ctl.c
@@ -18,7 +18,7 @@ static char *gost_params[GOST_PARAM_MAX+1]={NULL};
static const char *gost_envnames[]={"CRYPT_PARAMS"};
const ENGINE_CMD_DEFN gost_cmds[]=
{
-/* { GOST_CTRL_RNG,
+/*- { GOST_CTRL_RNG,
"RNG",
"Type of random number generator to use",
ENGINE_CMD_FLAG_STRING
diff --git a/engines/ccgost/gost_keywrap.c b/engines/ccgost/gost_keywrap.c
index c618f6da28..c8a4508b44 100644
--- a/engines/ccgost/gost_keywrap.c
+++ b/engines/ccgost/gost_keywrap.c
@@ -11,7 +11,8 @@
#include "gost89.h"
#include "gost_keywrap.h"
-/* Diversifies key using random UserKey Material
+/*-
+ * Diversifies key using random UserKey Material
* Implements RFC 4357 p 6.5 key diversification algorithm
*
* inputKey - 32byte key to be diversified
@@ -58,7 +59,7 @@ void keyDiversifyCryptoPro(gost_ctx *ctx,const unsigned char *inputKey, const un
}
-/*
+/*-
* Wraps key using RFC 4357 6.3
* ctx - gost encryption context, initialized with some S-boxes
* keyExchangeKey (KEK) 32-byte (256-bit) shared key
@@ -78,7 +79,7 @@ int keyWrapCryptoPro(gost_ctx *ctx,const unsigned char *keyExchangeKey, const un
gost_mac_iv(ctx,32,ukm,sessionKey,32,wrappedKey+40);
return 1;
}
-/*
+/*-
* Unwraps key using RFC 4357 6.4
* ctx - gost encryption context, initialized with some S-boxes
* keyExchangeKey 32-byte shared key
diff --git a/engines/ccgost/gost_keywrap.h b/engines/ccgost/gost_keywrap.h
index 37c2a0f73d..80c7927adb 100644
--- a/engines/ccgost/gost_keywrap.h
+++ b/engines/ccgost/gost_keywrap.h
@@ -11,7 +11,8 @@
#define GOST_KEYWRAP_H
#include <string.h>
#include "gost89.h"
-/* Diversifies key using random UserKey Material
+/*-
+ * Diversifies key using random UserKey Material
* Implements RFC 4357 p 6.5 key diversification algorithm
*
* inputKey - 32byte key to be diversified
@@ -23,7 +24,7 @@ void keyDiversifyCryptoPro(gost_ctx *ctx,
const unsigned char *inputKey,
const unsigned char *ukm,
unsigned char *outputKey);
-/*
+/*-
* Wraps key using RFC 4357 6.3
* ctx - gost encryption context, initialized with some S-boxes
* keyExchangeKey (KEK) 32-byte (256-bit) shared key
@@ -37,7 +38,7 @@ int keyWrapCryptoPro(gost_ctx *ctx,
const unsigned char *ukm,
const unsigned char *sessionKey,
unsigned char *wrappedKey) ;
-/*
+/*-
* Unwraps key using RFC 4357 6.4
* ctx - gost encryption context, initialized with some S-boxes
* keyExchangeKey 32-byte shared key
diff --git a/engines/ccgost/gost_sign.c b/engines/ccgost/gost_sign.c
index 93a1f270d6..17e9f13c71 100644
--- a/engines/ccgost/gost_sign.c
+++ b/engines/ccgost/gost_sign.c
@@ -101,7 +101,7 @@ DSA_SIG *gost_do_sign(const unsigned char *dgst,int dlen, DSA *dsa)
* Packs signature according to Cryptocom rules
* and frees up DSA_SIG structure
*/
-/*
+/*-
int pack_sign_cc(DSA_SIG *s,int order,unsigned char *sig, size_t *siglen)
{
*siglen = 2*order;
@@ -248,7 +248,7 @@ int gost_sign_keygen(DSA *dsa)
}
/* Unpack signature according to cryptocom rules */
-/*
+/*-
DSA_SIG *unpack_cc_signature(const unsigned char *sig,size_t siglen)
{
DSA_SIG *s;