diff options
author | marha <marha@users.sourceforge.net> | 2015-02-22 14:43:31 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-02-22 14:43:31 +0100 |
commit | c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (patch) | |
tree | 94b917df998c3d547e191b3b9c58bbffc616470e /openssl/crypto/jpake/jpake.h | |
parent | f1c2db43dcf35d2cf4715390bd2391c28e42a8c2 (diff) | |
download | vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.tar.gz vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.tar.bz2 vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.zip |
Upgraded to openssl-1.0.2
Diffstat (limited to 'openssl/crypto/jpake/jpake.h')
-rw-r--r-- | openssl/crypto/jpake/jpake.h | 93 |
1 files changed, 45 insertions, 48 deletions
diff --git a/openssl/crypto/jpake/jpake.h b/openssl/crypto/jpake/jpake.h index fd143b4d9..371eed679 100644 --- a/openssl/crypto/jpake/jpake.h +++ b/openssl/crypto/jpake/jpake.h @@ -1,63 +1,59 @@ /* * Implement J-PAKE, as described in * http://grouper.ieee.org/groups/1363/Research/contributions/hao-ryan-2008.pdf - * + * * With hints from http://www.cl.cam.ac.uk/~fh240/software/JPAKE2.java. */ #ifndef HEADER_JPAKE_H -#define HEADER_JPAKE_H +# define HEADER_JPAKE_H -#include <openssl/opensslconf.h> +# include <openssl/opensslconf.h> -#ifdef OPENSSL_NO_JPAKE -#error JPAKE is disabled. -#endif +# ifdef OPENSSL_NO_JPAKE +# error JPAKE is disabled. +# endif #ifdef __cplusplus extern "C" { #endif -#include <openssl/bn.h> -#include <openssl/sha.h> +# include <openssl/bn.h> +# include <openssl/sha.h> typedef struct JPAKE_CTX JPAKE_CTX; /* Note that "g" in the ZKPs is not necessarily the J-PAKE g. */ -typedef struct - { - BIGNUM *gr; /* g^r (r random) */ - BIGNUM *b; /* b = r - x*h, h=hash(g, g^r, g^x, name) */ - } JPAKE_ZKP; - -typedef struct - { - BIGNUM *gx; /* g^x in step 1, g^(xa + xc + xd) * xb * s in step 2 */ - JPAKE_ZKP zkpx; /* ZKP(x) or ZKP(xb * s) */ - } JPAKE_STEP_PART; - -typedef struct - { - JPAKE_STEP_PART p1; /* g^x3, ZKP(x3) or g^x1, ZKP(x1) */ - JPAKE_STEP_PART p2; /* g^x4, ZKP(x4) or g^x2, ZKP(x2) */ - } JPAKE_STEP1; +typedef struct { + BIGNUM *gr; /* g^r (r random) */ + BIGNUM *b; /* b = r - x*h, h=hash(g, g^r, g^x, name) */ +} JPAKE_ZKP; + +typedef struct { + BIGNUM *gx; /* g^x in step 1, g^(xa + xc + xd) * xb * s + * in step 2 */ + JPAKE_ZKP zkpx; /* ZKP(x) or ZKP(xb * s) */ +} JPAKE_STEP_PART; + +typedef struct { + JPAKE_STEP_PART p1; /* g^x3, ZKP(x3) or g^x1, ZKP(x1) */ + JPAKE_STEP_PART p2; /* g^x4, ZKP(x4) or g^x2, ZKP(x2) */ +} JPAKE_STEP1; typedef JPAKE_STEP_PART JPAKE_STEP2; -typedef struct - { +typedef struct { unsigned char hhk[SHA_DIGEST_LENGTH]; - } JPAKE_STEP3A; +} JPAKE_STEP3A; -typedef struct - { +typedef struct { unsigned char hk[SHA_DIGEST_LENGTH]; - } JPAKE_STEP3B; +} JPAKE_STEP3B; /* Parameters are copied */ JPAKE_CTX *JPAKE_CTX_new(const char *name, const char *peer_name, - const BIGNUM *p, const BIGNUM *g, const BIGNUM *q, - const BIGNUM *secret); + const BIGNUM *p, const BIGNUM *g, const BIGNUM *q, + const BIGNUM *secret); void JPAKE_CTX_free(JPAKE_CTX *ctx); /* @@ -100,7 +96,8 @@ void JPAKE_STEP3B_release(JPAKE_STEP3B *s3b); const BIGNUM *JPAKE_get_shared_key(JPAKE_CTX *ctx); /* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes +/* + * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ void ERR_load_JPAKE_strings(void); @@ -108,22 +105,22 @@ void ERR_load_JPAKE_strings(void); /* Error codes for the JPAKE functions. */ /* Function codes. */ -#define JPAKE_F_JPAKE_STEP1_PROCESS 101 -#define JPAKE_F_JPAKE_STEP2_PROCESS 102 -#define JPAKE_F_JPAKE_STEP3A_PROCESS 103 -#define JPAKE_F_JPAKE_STEP3B_PROCESS 104 -#define JPAKE_F_VERIFY_ZKP 100 +# define JPAKE_F_JPAKE_STEP1_PROCESS 101 +# define JPAKE_F_JPAKE_STEP2_PROCESS 102 +# define JPAKE_F_JPAKE_STEP3A_PROCESS 103 +# define JPAKE_F_JPAKE_STEP3B_PROCESS 104 +# define JPAKE_F_VERIFY_ZKP 100 /* Reason codes. */ -#define JPAKE_R_G_TO_THE_X3_IS_NOT_LEGAL 108 -#define JPAKE_R_G_TO_THE_X4_IS_NOT_LEGAL 109 -#define JPAKE_R_G_TO_THE_X4_IS_ONE 105 -#define JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH 106 -#define JPAKE_R_HASH_OF_KEY_MISMATCH 107 -#define JPAKE_R_VERIFY_B_FAILED 102 -#define JPAKE_R_VERIFY_X3_FAILED 103 -#define JPAKE_R_VERIFY_X4_FAILED 104 -#define JPAKE_R_ZKP_VERIFY_FAILED 100 +# define JPAKE_R_G_TO_THE_X3_IS_NOT_LEGAL 108 +# define JPAKE_R_G_TO_THE_X4_IS_NOT_LEGAL 109 +# define JPAKE_R_G_TO_THE_X4_IS_ONE 105 +# define JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH 106 +# define JPAKE_R_HASH_OF_KEY_MISMATCH 107 +# define JPAKE_R_VERIFY_B_FAILED 102 +# define JPAKE_R_VERIFY_X3_FAILED 103 +# define JPAKE_R_VERIFY_X4_FAILED 104 +# define JPAKE_R_ZKP_VERIFY_FAILED 100 #ifdef __cplusplus } |