From 2a7ff334b3396e496faf8c1b58920b581ce053fb Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 7 May 2015 20:19:30 +0200 Subject: [PATCH] Whitespace style changes Use tabs. --- srp.c | 1225 +++++++++++++++++++++++++--------------------------- srp.h | 95 ++-- test_srp.c | 519 +++++++++++----------- 3 files changed, 896 insertions(+), 943 deletions(-) diff --git a/srp.c b/srp.c index 73b701a..2de74b3 100644 --- a/srp.c +++ b/srp.c @@ -45,13 +45,13 @@ #define srp_dbg_data(data, datalen, prevtext) ; /*void srp_dbg_data(unsigned char * data, int datalen, char * prevtext) { - printf(prevtext); - int i; - for (i = 0; i < datalen; i++) - { - printf("%02X", data[i]); - } - printf("\n"); + printf(prevtext); + int i; + for (i = 0; i < datalen; i++) + { + printf("%02X", data[i]); + } + printf("\n"); }*/ static int g_initialized = 0; @@ -62,405 +62,391 @@ static unsigned char g_rand_buff[RAND_BUFF_MAX]; typedef struct { - mpz_t N; - mpz_t g; + mpz_t N; + mpz_t g; } NGConstant; struct NGHex { - const char * n_hex; - const char * g_hex; + const char* n_hex; + const char* g_hex; }; /* All constants here were pulled from Appendix A of RFC 5054 */ static struct NGHex global_Ng_constants[] = { - { /* 1024 */ - "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496" - "EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8E" - "F4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA" - "9AFD5138FE8376435B9FC61D2FC0EB06E3", - "2" - }, - { /* 2048 */ - "AC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4" - "A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF60" - "95179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF" - "747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B907" - "8717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB37861" - "60279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DB" - "FBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73", - "2" - }, - { /* 4096 */ - "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" - "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" - "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" - "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" - "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" - "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" - "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" - "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" - "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" - "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" - "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" - "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" - "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" - "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" - "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" - "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" - "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" - "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" - "FFFFFFFFFFFFFFFF", - "5" - }, - { /* 8192 */ - "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" - "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" - "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" - "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" - "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" - "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" - "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" - "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" - "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" - "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" - "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" - "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" - "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" - "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" - "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" - "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" - "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" - "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492" - "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406" - "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918" - "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151" - "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03" - "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F" - "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA" - "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B" - "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632" - "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E" - "6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA" - "3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C" - "5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9" - "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC886" - "2F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6" - "6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC5" - "0846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268" - "359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6" - "FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" - "60C980DD98EDD3DFFFFFFFFFFFFFFFFF", - "13" - }, - {0,0} /* null sentinel */ + { /* 1024 */ + "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496" + "EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8E" + "F4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA" + "9AFD5138FE8376435B9FC61D2FC0EB06E3", + "2" + }, + { /* 2048 */ + "AC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4" + "A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF60" + "95179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF" + "747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B907" + "8717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB37861" + "60279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DB" + "FBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73", + "2" + }, + { /* 4096 */ + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" + "FFFFFFFFFFFFFFFF", + "5" + }, + { /* 8192 */ + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08" + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B" + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9" + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6" + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8" + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D" + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C" + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718" + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D" + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D" + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226" + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26" + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB" + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2" + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127" + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492" + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406" + "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918" + "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151" + "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03" + "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F" + "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA" + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B" + "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632" + "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E" + "6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA" + "3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C" + "5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9" + "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC886" + "2F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6" + "6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC5" + "0846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268" + "359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6" + "FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" + "60C980DD98EDD3DFFFFFFFFFFFFFFFFF", + "13" + }, + {0,0} /* null sentinel */ }; -static NGConstant * new_ng( SRP_NGType ng_type, const char * n_hex, const char * g_hex ) +static NGConstant *new_ng( SRP_NGType ng_type, const char *n_hex, const char *g_hex ) { - NGConstant * ng = (NGConstant *) malloc( sizeof(NGConstant) ); - mpz_init(ng->N); - mpz_init(ng->g); + NGConstant *ng = (NGConstant *) malloc(sizeof(NGConstant)); + mpz_init(ng->N); + mpz_init(ng->g); - if( !ng || !ng->N || !ng->g ) - return 0; + if (!ng || !ng->N || !ng->g) + return 0; - if ( ng_type != SRP_NG_CUSTOM ) - { - n_hex = global_Ng_constants[ ng_type ].n_hex; - g_hex = global_Ng_constants[ ng_type ].g_hex; - } + if (ng_type != SRP_NG_CUSTOM) { + n_hex = global_Ng_constants[ ng_type ].n_hex; + g_hex = global_Ng_constants[ ng_type ].g_hex; + } - mpz_set_str( ng->N, n_hex, 16 ); - mpz_set_str( ng->g, g_hex, 16 ); + mpz_set_str(ng->N, n_hex, 16); + mpz_set_str(ng->g, g_hex, 16); - return ng; + return ng; } -static void delete_ng( NGConstant * ng ) +static void delete_ng( NGConstant *ng ) { - if (ng) - { - mpz_clear( ng->N ); - mpz_clear( ng->g ); - free(ng); - } + if (ng) { + mpz_clear(ng->N); + mpz_clear(ng->g); + free(ng); + } } typedef union { - SHA_CTX sha; - SHA256_CTX sha256; - //SHA512_CTX sha512; + SHA_CTX sha; + SHA256_CTX sha256; + //SHA512_CTX sha512; } HashCTX; struct SRPVerifier { - SRP_HashAlgorithm hash_alg; - NGConstant *ng; + SRP_HashAlgorithm hash_alg; + NGConstant *ng; - const char * username; - const unsigned char * bytes_B; - int authenticated; + const char *username; + const unsigned char *bytes_B; + int authenticated; - unsigned char M [SHA512_DIGEST_LENGTH]; - unsigned char H_AMK [SHA512_DIGEST_LENGTH]; - unsigned char session_key [SHA512_DIGEST_LENGTH]; + unsigned char M[SHA512_DIGEST_LENGTH]; + unsigned char H_AMK[SHA512_DIGEST_LENGTH]; + unsigned char session_key[SHA512_DIGEST_LENGTH]; }; struct SRPUser { - SRP_HashAlgorithm hash_alg; - NGConstant *ng; + SRP_HashAlgorithm hash_alg; + NGConstant *ng; - mpz_t a; - mpz_t A; - mpz_t S; + mpz_t a; + mpz_t A; + mpz_t S; - const unsigned char * bytes_A; - int authenticated; + const unsigned char *bytes_A; + int authenticated; - const char * username; - const char * username_verifier; - const unsigned char * password; - int password_len; + const char *username; + const char *username_verifier; + const unsigned char *password; + int password_len; - unsigned char M [SHA512_DIGEST_LENGTH]; - unsigned char H_AMK [SHA512_DIGEST_LENGTH]; - unsigned char session_key [SHA512_DIGEST_LENGTH]; + unsigned char M[SHA512_DIGEST_LENGTH]; + unsigned char H_AMK[SHA512_DIGEST_LENGTH]; + unsigned char session_key[SHA512_DIGEST_LENGTH]; }; -static int hash_init( SRP_HashAlgorithm alg, HashCTX *c ) +static int hash_init(SRP_HashAlgorithm alg, HashCTX *c) { - switch (alg) - { - case SRP_SHA1 : return SHA1_Init( &c->sha ); - /*case SRP_SHA224: return SHA224_Init( &c->sha256 );*/ - case SRP_SHA256: return SHA256_Init( &c->sha256 ); - /*case SRP_SHA384: return SHA384_Init( &c->sha512 ); - case SRP_SHA512: return SHA512_Init( &c->sha512 );*/ - default: - return -1; - }; + switch (alg) { + case SRP_SHA1: return SHA1_Init(&c->sha); + /*case SRP_SHA224: return SHA224_Init(&c->sha256);*/ + case SRP_SHA256: return SHA256_Init(&c->sha256); + /*case SRP_SHA384: return SHA384_Init(&c->sha512); + case SRP_SHA512: return SHA512_Init(&c->sha512);*/ + default: return -1; + }; } static int hash_update( SRP_HashAlgorithm alg, HashCTX *c, const void *data, size_t len ) { - switch (alg) - { - case SRP_SHA1 : return SHA1_Update( &c->sha, data, len ); - /*case SRP_SHA224: return SHA224_Update( &c->sha256, data, len );*/ - case SRP_SHA256: return SHA256_Update( &c->sha256, data, len ); - /*case SRP_SHA384: return SHA384_Update( &c->sha512, data, len ); - case SRP_SHA512: return SHA512_Update( &c->sha512, data, len );*/ - default: - return -1; - }; + switch (alg) { + case SRP_SHA1: return SHA1_Update(&c->sha, data, len); + /*case SRP_SHA224: return SHA224_Update(&c->sha256, data, len);*/ + case SRP_SHA256: return SHA256_Update(&c->sha256, data, len); + /*case SRP_SHA384: return SHA384_Update( &c->sha512, data, len ); + case SRP_SHA512: return SHA512_Update( &c->sha512, data, len );*/ + default: return -1; + }; } static int hash_final( SRP_HashAlgorithm alg, HashCTX *c, unsigned char *md ) { - switch (alg) - { - case SRP_SHA1 : return SHA1_Final( md, &c->sha ); - /*case SRP_SHA224: return SHA224_Final( md, &c->sha256 );*/ - case SRP_SHA256: return SHA256_Final( md, &c->sha256 ); - /*case SRP_SHA384: return SHA384_Final( md, &c->sha512 ); - case SRP_SHA512: return SHA512_Final( md, &c->sha512 );*/ - default: - return -1; - }; + switch (alg) { + case SRP_SHA1: return SHA1_Final(md, &c->sha); + /*case SRP_SHA224: return SHA224_Final(md, &c->sha256);*/ + case SRP_SHA256: return SHA256_Final(md, &c->sha256); + /*case SRP_SHA384: return SHA384_Final(md, &c->sha512); + case SRP_SHA512: return SHA512_Final(md, &c->sha512);*/ + default: return -1; + }; } -static unsigned char * hash( SRP_HashAlgorithm alg, const unsigned char *d, size_t n, unsigned char *md ) +static unsigned char *hash(SRP_HashAlgorithm alg, const unsigned char *d, size_t n, unsigned char *md) { - switch (alg) - { - case SRP_SHA1 : return SHA1( d, n, md ); - /*case SRP_SHA224: return SHA224( d, n, md );*/ - case SRP_SHA256: return SHA256( d, n, md ); - /*case SRP_SHA384: return SHA384( d, n, md ); - case SRP_SHA512: return SHA512( d, n, md );*/ - default: - return 0; - }; + switch (alg) { + case SRP_SHA1: return SHA1(d, n, md); + /*case SRP_SHA224: return SHA224( d, n, md );*/ + case SRP_SHA256: return SHA256(d, n, md); + /*case SRP_SHA384: return SHA384( d, n, md ); + case SRP_SHA512: return SHA512( d, n, md );*/ + default: return 0; + }; } -static int hash_length( SRP_HashAlgorithm alg ) +static int hash_length(SRP_HashAlgorithm alg) { - switch (alg) - { - case SRP_SHA1 : return SHA_DIGEST_LENGTH; - /*case SRP_SHA224: return SHA224_DIGEST_LENGTH;*/ - case SRP_SHA256: return SHA256_DIGEST_LENGTH; - /*case SRP_SHA384: return SHA384_DIGEST_LENGTH; - case SRP_SHA512: return SHA512_DIGEST_LENGTH;*/ - default: - return -1; - }; + switch (alg) { + case SRP_SHA1: return SHA_DIGEST_LENGTH; + /*case SRP_SHA224: return SHA224_DIGEST_LENGTH;*/ + case SRP_SHA256: return SHA256_DIGEST_LENGTH; + /*case SRP_SHA384: return SHA384_DIGEST_LENGTH; + case SRP_SHA512: return SHA512_DIGEST_LENGTH;*/ + default: return -1; + }; } -inline static int mpz_num_bytes( const mpz_t op ) +inline static int mpz_num_bytes(const mpz_t op) { - return (mpz_sizeinbase (op, 2) + 7) / 8; + return (mpz_sizeinbase (op, 2) + 7) / 8; } -inline static void mpz_to_bin( const mpz_t op, unsigned char * to ) +inline static void mpz_to_bin(const mpz_t op, unsigned char *to) { - mpz_export(to, NULL, 1, 1, 1, 0, op); + mpz_export(to, NULL, 1, 1, 1, 0, op); } -inline static void mpz_from_bin( const unsigned char * s, int len, mpz_t ret ) +inline static void mpz_from_bin(const unsigned char *s, int len, mpz_t ret) { - mpz_import(ret, len, 1, 1, 1, 0, s); + mpz_import(ret, len, 1, 1, 1, 0, s); } // set op to (op1 * op2) mod d, using tmp for the calculation -inline static void mpz_mulm( mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp ) +inline static void mpz_mulm(mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) { - mpz_mul( tmp, op1, op2 ); - mpz_mod( op, tmp, d ); + mpz_mul(tmp, op1, op2); + mpz_mod(op, tmp, d); } // set op to (op1 + op2) mod d, using tmp for the calculation inline static void mpz_addm( mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp ) { - mpz_add( tmp, op1, op2 ); - mpz_mod( op, tmp, d ); + mpz_add(tmp, op1, op2); + mpz_mod(op, tmp, d); } // set op to (op1 - op2) mod d, using tmp for the calculation -inline static void mpz_subm( mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp ) +inline static void mpz_subm(mpz_t op, const mpz_t op1, const mpz_t op2, const mpz_t d, mpz_t tmp) { - mpz_sub( tmp, op1, op2 ); - mpz_mod( op, tmp, d ); + mpz_sub(tmp, op1, op2); + mpz_mod(op, tmp, d); } -static int H_nn( mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, const mpz_t n2 ) +static int H_nn(mpz_t result, SRP_HashAlgorithm alg, const mpz_t N, const mpz_t n1, const mpz_t n2) { - unsigned char buff[ SHA512_DIGEST_LENGTH ]; - int len_N = mpz_num_bytes(N); - int len_n1 = mpz_num_bytes(n1); - int len_n2 = mpz_num_bytes(n2); - int nbytes = len_N + len_N; - unsigned char * bin = (unsigned char *) malloc( nbytes ); - if (!bin) - return 0; - if (len_n1 > len_N || len_n2 > len_N) - { - free(bin); - return 0; - } - memset(bin, 0, nbytes); - mpz_to_bin(n1, bin + (len_N - len_n1)); - mpz_to_bin(n2, bin + (len_N + len_N - len_n2)); - hash( alg, bin, nbytes, buff ); - free(bin); - mpz_from_bin(buff, hash_length(alg), result); - return 1; + unsigned char buff[SHA512_DIGEST_LENGTH]; + int len_N = mpz_num_bytes(N); + int len_n1 = mpz_num_bytes(n1); + int len_n2 = mpz_num_bytes(n2); + int nbytes = len_N + len_N; + unsigned char *bin = (unsigned char *) malloc(nbytes); + if (!bin) + return 0; + if (len_n1 > len_N || len_n2 > len_N) { + free(bin); + return 0; + } + memset(bin, 0, nbytes); + mpz_to_bin(n1, bin + (len_N - len_n1)); + mpz_to_bin(n2, bin + (len_N + len_N - len_n2)); + hash( alg, bin, nbytes, buff ); + free(bin); + mpz_from_bin(buff, hash_length(alg), result); + return 1; } -static int H_ns( mpz_t result, SRP_HashAlgorithm alg, const unsigned char * n, int len_n, const unsigned char * bytes, int len_bytes ) +static int H_ns(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *n, int len_n, const unsigned char *bytes, int len_bytes) { - unsigned char buff[ SHA512_DIGEST_LENGTH ]; - int nbytes = len_n + len_bytes; - unsigned char * bin = (unsigned char *) malloc( nbytes ); - if (!bin) - return 0; - memcpy( bin, n, len_n ); - memcpy( bin + len_n, bytes, len_bytes ); - hash( alg, bin, nbytes, buff ); - free(bin); - mpz_from_bin(buff, hash_length(alg), result); - return 1; + unsigned char buff[SHA512_DIGEST_LENGTH]; + int nbytes = len_n + len_bytes; + unsigned char *bin = (unsigned char *) malloc(nbytes); + if (!bin) + return 0; + memcpy(bin, n, len_n); + memcpy(bin + len_n, bytes, len_bytes); + hash(alg, bin, nbytes, buff); + free(bin); + mpz_from_bin(buff, hash_length(alg), result); + return 1; } -static int calculate_x( mpz_t result, SRP_HashAlgorithm alg, const unsigned char * salt, int salt_len, const char * username, const unsigned char * password, int password_len ) +static int calculate_x(mpz_t result, SRP_HashAlgorithm alg, const unsigned char *salt, int salt_len, const char *username, const unsigned char *password, int password_len) { - unsigned char ucp_hash[SHA512_DIGEST_LENGTH]; - HashCTX ctx; + unsigned char ucp_hash[SHA512_DIGEST_LENGTH]; + HashCTX ctx; + hash_init(alg, &ctx); - hash_init( alg, &ctx ); + srp_dbg_data((char*) username, strlen(username), "Username for x: "); + srp_dbg_data((char*) password, password_len, "Password for x: "); + hash_update(alg, &ctx, username, strlen(username)); + hash_update(alg, &ctx, ":", 1); + hash_update(alg, &ctx, password, password_len); - srp_dbg_data((char*) username, strlen(username), "Username for x: "); - srp_dbg_data((char*) password, password_len, "Password for x: "); + hash_final(alg, &ctx, ucp_hash); - hash_update( alg, &ctx, username, strlen(username) ); - hash_update( alg, &ctx, ":", 1 ); - hash_update( alg, &ctx, password, password_len ); - - hash_final( alg, &ctx, ucp_hash ); - - return H_ns( result, alg, salt, salt_len, ucp_hash, hash_length(alg) ); + return H_ns(result, alg, salt, salt_len, ucp_hash, hash_length(alg)); } -static void update_hash_n( SRP_HashAlgorithm alg, HashCTX *ctx, const mpz_t n ) +static void update_hash_n(SRP_HashAlgorithm alg, HashCTX *ctx, const mpz_t n) { - unsigned long len = mpz_num_bytes(n); - unsigned char * n_bytes = (unsigned char *) malloc( len ); - if (!n_bytes) - return; - mpz_to_bin(n, n_bytes); - hash_update(alg, ctx, n_bytes, len); - free(n_bytes); + unsigned long len = mpz_num_bytes(n); + unsigned char* n_bytes = (unsigned char *) malloc(len); + if (!n_bytes) + return; + mpz_to_bin(n, n_bytes); + hash_update(alg, ctx, n_bytes, len); + free(n_bytes); } -static void hash_num( SRP_HashAlgorithm alg, const mpz_t n, unsigned char * dest ) +static void hash_num( SRP_HashAlgorithm alg, const mpz_t n, unsigned char *dest ) { - int nbytes = mpz_num_bytes(n); - unsigned char * bin = (unsigned char *) malloc( nbytes ); - if(!bin) - return; - mpz_to_bin(n, bin); - hash( alg, bin, nbytes, dest ); - free(bin); + int nbytes = mpz_num_bytes(n); + unsigned char *bin = (unsigned char *) malloc(nbytes); + if(!bin) + return; + mpz_to_bin(n, bin); + hash(alg, bin, nbytes, dest); + free(bin); } -static void calculate_M( SRP_HashAlgorithm alg, NGConstant *ng, unsigned char * dest, const char * I, const unsigned char * s_bytes, int s_len, - const mpz_t A, const mpz_t B, const unsigned char * K ) +static void calculate_M(SRP_HashAlgorithm alg, NGConstant *ng, unsigned char *dest, + const char *I, const unsigned char *s_bytes, int s_len, + const mpz_t A, const mpz_t B, const unsigned char *K) { - unsigned char H_N[ SHA512_DIGEST_LENGTH ]; - unsigned char H_g[ SHA512_DIGEST_LENGTH ]; - unsigned char H_I[ SHA512_DIGEST_LENGTH ]; - unsigned char H_xor[ SHA512_DIGEST_LENGTH ]; - HashCTX ctx; - int i = 0; - int hash_len = hash_length(alg); + unsigned char H_N[SHA512_DIGEST_LENGTH]; + unsigned char H_g[SHA512_DIGEST_LENGTH]; + unsigned char H_I[SHA512_DIGEST_LENGTH]; + unsigned char H_xor[SHA512_DIGEST_LENGTH]; + HashCTX ctx; + int i = 0; + int hash_len = hash_length(alg); - hash_num( alg, ng->N, H_N ); - hash_num( alg, ng->g, H_g ); + hash_num(alg, ng->N, H_N); + hash_num(alg, ng->g, H_g); - hash(alg, (const unsigned char *)I, strlen(I), H_I); + hash(alg, (const unsigned char *)I, strlen(I), H_I); - for (i=0; i < hash_len; i++ ) - H_xor[i] = H_N[i] ^ H_g[i]; + for (i = 0; i < hash_len; i++ ) + H_xor[i] = H_N[i] ^ H_g[i]; - hash_init( alg, &ctx ); + hash_init(alg, &ctx); - hash_update( alg, &ctx, H_xor, hash_len ); - hash_update( alg, &ctx, H_I, hash_len ); - hash_update( alg, &ctx, s_bytes, s_len ); - update_hash_n( alg, &ctx, A ); - update_hash_n( alg, &ctx, B ); - hash_update( alg, &ctx, K, hash_len ); + hash_update(alg, &ctx, H_xor, hash_len); + hash_update(alg, &ctx, H_I, hash_len); + hash_update(alg, &ctx, s_bytes, s_len); + update_hash_n(alg, &ctx, A); + update_hash_n(alg, &ctx, B); + hash_update(alg, &ctx, K, hash_len); - hash_final( alg, &ctx, dest ); + hash_final(alg, &ctx, dest); } -static void calculate_H_AMK( SRP_HashAlgorithm alg, unsigned char *dest, const mpz_t A, const unsigned char * M, const unsigned char * K ) +static void calculate_H_AMK(SRP_HashAlgorithm alg, unsigned char *dest, const mpz_t A, const unsigned char *M, const unsigned char *K) { - HashCTX ctx; + HashCTX ctx; - hash_init( alg, &ctx ); + hash_init(alg, &ctx); - update_hash_n( alg, &ctx, A ); - hash_update( alg, &ctx, M, hash_length(alg) ); - hash_update( alg, &ctx, K, hash_length(alg) ); + update_hash_n(alg, &ctx, A); + hash_update(alg, &ctx, M, hash_length(alg)); + hash_update(alg, &ctx, K, hash_length(alg)); - hash_final( alg, &ctx, dest ); + hash_final(alg, &ctx, dest); } @@ -526,30 +512,30 @@ static int fill_buff() return 1; } -static void mpz_fill_random( mpz_t num ) +static void mpz_fill_random(mpz_t num) { - // was call: BN_rand(num, 256, -1, 0); - if (RAND_BUFF_MAX - g_rand_idx < 32) - fill_buff(); - mpz_from_bin( (const char *) (&g_rand_buff[g_rand_idx]), 32, num ); - g_rand_idx += 32; + // was call: BN_rand(num, 256, -1, 0); + if (RAND_BUFF_MAX - g_rand_idx < 32) + fill_buff(); + mpz_from_bin((const char *) (&g_rand_buff[g_rand_idx]), 32, num); + g_rand_idx += 32; } static void init_random() { - if (g_initialized) - return; - g_initialized = fill_buff(); + if (g_initialized) + return; + g_initialized = fill_buff(); } #define srp_dbg_num(num, text) ; /*void srp_dbg_num(mpz_t num, char * prevtext) { - int len_num = mpz_num_bytes(num); - char *bytes_num = (char*) malloc(len_num); - mpz_to_bin(num, (unsigned char *) bytes_num); - srp_dbg_data(bytes_num, len_num, prevtext); - free(bytes_num); + int len_num = mpz_num_bytes(num); + char *bytes_num = (char*) malloc(len_num); + mpz_to_bin(num, (unsigned char *) bytes_num); + srp_dbg_data(bytes_num, len_num, prevtext); + free(bytes_num); }*/ @@ -560,49 +546,50 @@ static void init_random() ***********************************************************************************************************/ void srp_create_salted_verification_key( SRP_HashAlgorithm alg, - SRP_NGType ng_type, const char * username_for_verifier, - const unsigned char * password, int len_password, - const unsigned char ** bytes_s, int * len_s, - const unsigned char ** bytes_v, int * len_v, - const char * n_hex, const char * g_hex ) + SRP_NGType ng_type, const char *username_for_verifier, + const unsigned char *password, int len_password, + const unsigned char **bytes_s, int *len_s, + const unsigned char **bytes_v, int *len_v, + const char *n_hex, const char *g_hex ) { - mpz_t v; mpz_init(v); - mpz_t x; mpz_init(x); - NGConstant * ng = new_ng( ng_type, n_hex, g_hex ); + mpz_t v; mpz_init(v); + mpz_t x; mpz_init(x); + NGConstant *ng = new_ng(ng_type, n_hex, g_hex); - if( !ng ) - goto cleanup_and_exit; + if(!ng) + goto cleanup_and_exit; - if( bytes_s == NULL ) { - *len_s = 16; - if ( RAND_BUFF_MAX - g_rand_idx < 16 ) - fill_buff(); - *bytes_s = (const unsigned char *) malloc( sizeof(char) * 16 ); - memcpy( (unsigned char *) *bytes_s, &g_rand_buff + g_rand_idx, sizeof(char) * 16 ); - g_rand_idx += 16; - } + if (bytes_s == NULL) { + *len_s = 16; + if (RAND_BUFF_MAX - g_rand_idx < 16) + fill_buff(); + *bytes_s = (const unsigned char *) malloc(sizeof(char) * 16); + memcpy((unsigned char *) *bytes_s, &g_rand_buff + g_rand_idx, sizeof(char) * 16); + g_rand_idx += 16; + } - if( !calculate_x( x, alg, *bytes_s, *len_s, username_for_verifier, password, len_password )) - goto cleanup_and_exit; + if (!calculate_x(x, alg, *bytes_s, *len_s, username_for_verifier, + password, len_password)) + goto cleanup_and_exit; - srp_dbg_num(x, "Server calculated x: "); + srp_dbg_num(x, "Server calculated x: "); - mpz_powm(v, ng->g, x, ng->N); + mpz_powm(v, ng->g, x, ng->N); - *len_v = mpz_num_bytes(v); + *len_v = mpz_num_bytes(v); - *bytes_v = (const unsigned char *) malloc( *len_v ); + *bytes_v = (const unsigned char *) malloc(*len_v); - if (!bytes_v) - goto cleanup_and_exit; + if (!bytes_v) + goto cleanup_and_exit; - mpz_to_bin(v, (unsigned char *) *bytes_v); + mpz_to_bin(v, (unsigned char *) *bytes_v); - cleanup_and_exit: - delete_ng( ng ); - mpz_clear(v); - mpz_clear(x); +cleanup_and_exit: + delete_ng( ng ); + mpz_clear(v); + mpz_clear(x); } @@ -611,421 +598,403 @@ void srp_create_salted_verification_key( SRP_HashAlgorithm alg, * * On failure, bytes_B will be set to NULL and len_B will be set to 0 */ -struct SRPVerifier * srp_verifier_new( SRP_HashAlgorithm alg, SRP_NGType ng_type, const char * username, - const unsigned char * bytes_s, int len_s, - const unsigned char * bytes_v, int len_v, - const unsigned char * bytes_A, int len_A, - const unsigned char * bytes_b, int len_b, - const unsigned char ** bytes_B, int * len_B, - const char * n_hex, const char * g_hex ) +struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg, + SRP_NGType ng_type, const char *username, + const unsigned char *bytes_s, int len_s, + const unsigned char *bytes_v, int len_v, + const unsigned char *bytes_A, int len_A, + const unsigned char *bytes_b, int len_b, + const unsigned char **bytes_B, int *len_B, + const char *n_hex, const char *g_hex ) { - mpz_t v; mpz_init(v); mpz_from_bin(bytes_v, len_v, v); - mpz_t A; mpz_init(A); mpz_from_bin(bytes_A, len_A, A); - mpz_t u; mpz_init(u); - mpz_t B; mpz_init(B); - mpz_t S; mpz_init(S); - mpz_t b; mpz_init(b); - mpz_t k; mpz_init(k); - mpz_t tmp1; mpz_init(tmp1); - mpz_t tmp2; mpz_init(tmp2); - mpz_t tmp3; mpz_init(tmp3); - int ulen = strlen(username) + 1; - NGConstant *ng = new_ng( ng_type, n_hex, g_hex ); - struct SRPVerifier *ver = 0; + mpz_t v; mpz_init(v); mpz_from_bin(bytes_v, len_v, v); + mpz_t A; mpz_init(A); mpz_from_bin(bytes_A, len_A, A); + mpz_t u; mpz_init(u); + mpz_t B; mpz_init(B); + mpz_t S; mpz_init(S); + mpz_t b; mpz_init(b); + mpz_t k; mpz_init(k); + mpz_t tmp1; mpz_init(tmp1); + mpz_t tmp2; mpz_init(tmp2); + mpz_t tmp3; mpz_init(tmp3); + int ulen = strlen(username) + 1; + NGConstant *ng = new_ng(ng_type, n_hex, g_hex); + struct SRPVerifier *ver = 0; - *len_B = 0; - *bytes_B = 0; + *len_B = 0; + *bytes_B = 0; - if( !ng ) - goto cleanup_and_exit; + if (!ng) + goto cleanup_and_exit; - ver = (struct SRPVerifier *) malloc( sizeof(struct SRPVerifier) ); + ver = (struct SRPVerifier *) malloc( sizeof(struct SRPVerifier) ); - if (!ver) - goto cleanup_and_exit; + if (!ver) + goto cleanup_and_exit; - init_random(); /* Only happens once */ + init_random(); /* Only happens once */ - ver->username = (char *) malloc( ulen ); - ver->hash_alg = alg; - ver->ng = ng; + ver->username = (char *) malloc(ulen); + ver->hash_alg = alg; + ver->ng = ng; - if (!ver->username) - { - free(ver); - ver = 0; - goto cleanup_and_exit; - } + if (!ver->username) { + free(ver); + ver = 0; + goto cleanup_and_exit; + } - memcpy( (char*)ver->username, username, ulen ); + memcpy((char*)ver->username, username, ulen); - ver->authenticated = 0; + ver->authenticated = 0; - /* SRP-6a safety check */ - mpz_mod(tmp1, A, ng->N); - if ( mpz_sgn(tmp1) != 0 ) - { - if (bytes_b) - { - mpz_from_bin(bytes_b, len_b, b); - } else { - mpz_fill_random(b); - } + /* SRP-6a safety check */ + mpz_mod(tmp1, A, ng->N); + if (mpz_sgn(tmp1) != 0) { + if (bytes_b) { + mpz_from_bin(bytes_b, len_b, b); + } else { + mpz_fill_random(b); + } - if (!H_nn(k, alg, ng->N, ng->N, ng->g)) - { - free(ver); - ver = 0; - goto cleanup_and_exit; - } + if (!H_nn(k, alg, ng->N, ng->N, ng->g)) { + free(ver); + ver = 0; + goto cleanup_and_exit; + } - /* B = kv + g^b */ - mpz_mulm(tmp1, k, v, ng->N, tmp3); - mpz_powm(tmp2, ng->g, b, ng->N); - mpz_addm(B, tmp1, tmp2, ng->N, tmp3); + /* B = kv + g^b */ + mpz_mulm(tmp1, k, v, ng->N, tmp3); + mpz_powm(tmp2, ng->g, b, ng->N); + mpz_addm(B, tmp1, tmp2, ng->N, tmp3); - if (!H_nn(u, alg, ng->N, A, B)) - { - free(ver); - ver = 0; - goto cleanup_and_exit; - } + if (!H_nn(u, alg, ng->N, A, B)) { + free(ver); + ver = 0; + goto cleanup_and_exit; + } - srp_dbg_num(u, "Server calculated u: "); + srp_dbg_num(u, "Server calculated u: "); - /* S = (A *(v^u)) ^ b */ - mpz_powm(tmp1, v, u, ng->N); - mpz_mulm(tmp2, A, tmp1, ng->N, tmp3); - mpz_powm(S, tmp2, b, ng->N); + /* S = (A *(v^u)) ^ b */ + mpz_powm(tmp1, v, u, ng->N); + mpz_mulm(tmp2, A, tmp1, ng->N, tmp3); + mpz_powm(S, tmp2, b, ng->N); - hash_num(alg, S, ver->session_key); + hash_num(alg, S, ver->session_key); - calculate_M( alg, ng, ver->M, username, bytes_s, len_s, A, B, ver->session_key ); - calculate_H_AMK( alg, ver->H_AMK, A, ver->M, ver->session_key ); + calculate_M(alg, ng, ver->M, username, bytes_s, len_s, A, B, ver->session_key); + calculate_H_AMK(alg, ver->H_AMK, A, ver->M, ver->session_key); - *len_B = mpz_num_bytes(B); - *bytes_B = (const unsigned char *) malloc( *len_B ); + *len_B = mpz_num_bytes(B); + *bytes_B = (const unsigned char *) malloc(*len_B); - if( !*bytes_B ) - { - free( (void*) ver->username ); - free( ver ); - ver = 0; - *len_B = 0; - goto cleanup_and_exit; - } + if (!*bytes_B) { + free((void*) ver->username); + free(ver); + ver = 0; + *len_B = 0; + goto cleanup_and_exit; + } - mpz_to_bin( B, (unsigned char *) *bytes_B ); + mpz_to_bin(B, (unsigned char *) *bytes_B); - ver->bytes_B = *bytes_B; - } else { - free(ver); - ver = 0; - } + ver->bytes_B = *bytes_B; + } else { + free(ver); + ver = 0; + } - cleanup_and_exit: - mpz_clear(v); - mpz_clear(A); - mpz_clear(u); - mpz_clear(k); - mpz_clear(B); - mpz_clear(S); - mpz_clear(b); - mpz_clear(tmp1); - mpz_clear(tmp2); - mpz_clear(tmp3); - - return ver; +cleanup_and_exit: + mpz_clear(v); + mpz_clear(A); + mpz_clear(u); + mpz_clear(k); + mpz_clear(B); + mpz_clear(S); + mpz_clear(b); + mpz_clear(tmp1); + mpz_clear(tmp2); + mpz_clear(tmp3); + return ver; } -void srp_verifier_delete( struct SRPVerifier * ver ) +void srp_verifier_delete(struct SRPVerifier *ver) { - if (ver) - { - delete_ng( ver->ng ); - free( (char *) ver->username ); - free( (unsigned char *) ver->bytes_B ); - memset(ver, 0, sizeof(*ver)); - free( ver ); - } + if (ver) { + delete_ng(ver->ng); + free((char *) ver->username); + free((unsigned char *) ver->bytes_B); + memset(ver, 0, sizeof(*ver)); + free(ver); + } } -int srp_verifier_is_authenticated( struct SRPVerifier * ver ) +int srp_verifier_is_authenticated(struct SRPVerifier *ver) { - return ver->authenticated; + return ver->authenticated; } -const char * srp_verifier_get_username( struct SRPVerifier * ver ) +const char *srp_verifier_get_username(struct SRPVerifier *ver) { - return ver->username; + return ver->username; } -const unsigned char * srp_verifier_get_session_key( struct SRPVerifier * ver, int * key_length ) +const unsigned char *srp_verifier_get_session_key(struct SRPVerifier *ver, int *key_length) { - if (key_length) - *key_length = hash_length( ver->hash_alg ); - return ver->session_key; + if (key_length) + *key_length = hash_length(ver->hash_alg); + return ver->session_key; } -int srp_verifier_get_session_key_length( struct SRPVerifier * ver ) +int srp_verifier_get_session_key_length(struct SRPVerifier *ver) { - return hash_length( ver->hash_alg ); + return hash_length(ver->hash_alg); } /* user_M must be exactly SHA512_DIGEST_LENGTH bytes in size */ -void srp_verifier_verify_session( struct SRPVerifier * ver, const unsigned char * user_M, const unsigned char ** bytes_HAMK ) +void srp_verifier_verify_session(struct SRPVerifier *ver, const unsigned char *user_M, const unsigned char **bytes_HAMK) { - if ( memcmp( ver->M, user_M, hash_length(ver->hash_alg) ) == 0 ) - { - ver->authenticated = 1; - *bytes_HAMK = ver->H_AMK; - } - else - *bytes_HAMK = NULL; + if (memcmp(ver->M, user_M, hash_length(ver->hash_alg)) == 0) { + ver->authenticated = 1; + *bytes_HAMK = ver->H_AMK; + } else + *bytes_HAMK = NULL; } /*******************************************************************************/ -struct SRPUser * srp_user_new( SRP_HashAlgorithm alg, SRP_NGType ng_type, - const char * username, const char * username_for_verifier, - const unsigned char * bytes_password, int len_password, - const char * n_hex, const char * g_hex ) +struct SRPUser *srp_user_new( SRP_HashAlgorithm alg, SRP_NGType ng_type, + const char *username, const char *username_for_verifier, + const unsigned char *bytes_password, int len_password, + const char *n_hex, const char *g_hex ) { - struct SRPUser *usr = (struct SRPUser *) malloc( sizeof(struct SRPUser) ); - int ulen = strlen(username) + 1; - int uvlen = strlen(username_for_verifier) + 1; + struct SRPUser *usr = (struct SRPUser *) malloc(sizeof(struct SRPUser)); + int ulen = strlen(username) + 1; + int uvlen = strlen(username_for_verifier) + 1; - if (!usr) - goto err_exit; + if (!usr) + goto err_exit; - init_random(); /* Only happens once */ + init_random(); /* Only happens once */ - usr->hash_alg = alg; - usr->ng = new_ng( ng_type, n_hex, g_hex ); + usr->hash_alg = alg; + usr->ng = new_ng(ng_type, n_hex, g_hex); - mpz_init(usr->a); - mpz_init(usr->A); - mpz_init(usr->S); + mpz_init(usr->a); + mpz_init(usr->A); + mpz_init(usr->S); - if (!usr->ng || !usr->a || !usr->A || !usr->S) - goto err_exit; + if (!usr->ng || !usr->a || !usr->A || !usr->S) + goto err_exit; - usr->username = (const char *) malloc(ulen); - usr->username_verifier = (const char *) malloc(uvlen); - usr->password = (const unsigned char *) malloc(len_password); - usr->password_len = len_password; + usr->username = (const char *) malloc(ulen); + usr->username_verifier = (const char *) malloc(uvlen); + usr->password = (const unsigned char *) malloc(len_password); + usr->password_len = len_password; - if (!usr->username || !usr->password) - goto err_exit; + if (!usr->username || !usr->password) + goto err_exit; - memcpy((char *)usr->username, username, ulen); - memcpy((char *)usr->username_verifier, username_for_verifier, uvlen); - memcpy((char *)usr->password, bytes_password, len_password); + memcpy((char *)usr->username, username, ulen); + memcpy((char *)usr->username_verifier, username_for_verifier, uvlen); + memcpy((char *)usr->password, bytes_password, len_password); - usr->authenticated = 0; + usr->authenticated = 0; - usr->bytes_A = 0; + usr->bytes_A = 0; - return usr; + return usr; - err_exit: - if (usr) - { - mpz_clear(usr->a); - mpz_clear(usr->A); - mpz_clear(usr->S); - if (usr->username) - free((void*)usr->username); - if (usr->username_verifier) - free((void*)usr->username_verifier); - if (usr->password) - { - memset((void*)usr->password, 0, usr->password_len); - free((void*)usr->password); - } - free(usr); - } +err_exit: + if (usr) { + mpz_clear(usr->a); + mpz_clear(usr->A); + mpz_clear(usr->S); + if (usr->username) + free((void*)usr->username); + if (usr->username_verifier) + free((void*)usr->username_verifier); + if (usr->password) { + memset((void*)usr->password, 0, usr->password_len); + free((void*)usr->password); + } + free(usr); + } - return 0; + return 0; } -void srp_user_delete( struct SRPUser * usr ) +void srp_user_delete(struct SRPUser *usr) { - if( usr ) - { - mpz_clear( usr->a ); - mpz_clear( usr->A ); - mpz_clear( usr->S ); + if(usr) { + mpz_clear(usr->a); + mpz_clear(usr->A); + mpz_clear(usr->S); - delete_ng( usr->ng ); + delete_ng(usr->ng); - memset((void*)usr->password, 0, usr->password_len); + memset((void*)usr->password, 0, usr->password_len); - free((char *)usr->username); - free((char *)usr->username_verifier); - free((char *)usr->password); + free((char *)usr->username); + free((char *)usr->username_verifier); + free((char *)usr->password); - if (usr->bytes_A) - free( (char *)usr->bytes_A ); + if (usr->bytes_A) + free((char *)usr->bytes_A); - memset(usr, 0, sizeof(*usr)); - free( usr ); - } + memset(usr, 0, sizeof(*usr)); + free(usr); + } } -int srp_user_is_authenticated( struct SRPUser * usr) +int srp_user_is_authenticated(struct SRPUser *usr) { - return usr->authenticated; + return usr->authenticated; } -const char * srp_user_get_username( struct SRPUser * usr ) +const char *srp_user_get_username(struct SRPUser *usr) { - return usr->username; + return usr->username; } - -const unsigned char * srp_user_get_session_key( struct SRPUser * usr, int * key_length ) +const unsigned char *srp_user_get_session_key(struct SRPUser *usr, int *key_length) { - if (key_length) - *key_length = hash_length( usr->hash_alg ); - return usr->session_key; + if (key_length) + *key_length = hash_length(usr->hash_alg); + return usr->session_key; } -int srp_user_get_session_key_length( struct SRPUser * usr ) +int srp_user_get_session_key_length(struct SRPUser *usr) { - return hash_length( usr->hash_alg ); + return hash_length(usr->hash_alg); } - /* Output: username, bytes_A, len_A */ -void srp_user_start_authentication( struct SRPUser * usr, const char ** username, - const unsigned char * bytes_a, int len_a, - const unsigned char ** bytes_A, int * len_A ) +void srp_user_start_authentication(struct SRPUser *usr, const char **username, + const unsigned char *bytes_a, int len_a, + const unsigned char **bytes_A, int *len_A) { - if (bytes_a) - { - mpz_from_bin(bytes_a, len_a, usr->a); - } else { - mpz_fill_random(usr->a); - } + if (bytes_a) { + mpz_from_bin(bytes_a, len_a, usr->a); + } else { + mpz_fill_random(usr->a); + } - mpz_powm(usr->A, usr->ng->g, usr->a, usr->ng->N); + mpz_powm(usr->A, usr->ng->g, usr->a, usr->ng->N); - *len_A = mpz_num_bytes(usr->A); - *bytes_A = (const unsigned char *) malloc( *len_A ); + *len_A = mpz_num_bytes(usr->A); + *bytes_A = (const unsigned char *) malloc(*len_A); - if (!*bytes_A) - { - *len_A = 0; - *bytes_A = 0; - *username = 0; - return; - } + if (!*bytes_A) { + *len_A = 0; + *bytes_A = 0; + *username = 0; + return; + } - mpz_to_bin( usr->A, (unsigned char *) *bytes_A ); + mpz_to_bin(usr->A, (unsigned char *) *bytes_A); - usr->bytes_A = *bytes_A; - if ( username ) - *username = usr->username; + usr->bytes_A = *bytes_A; + if (username) + *username = usr->username; } /* Output: bytes_M. Buffer length is SHA512_DIGEST_LENGTH */ -void srp_user_process_challenge( struct SRPUser * usr, - const unsigned char * bytes_s, int len_s, - const unsigned char * bytes_B, int len_B, - const unsigned char ** bytes_M, int * len_M ) +void srp_user_process_challenge(struct SRPUser *usr, + const unsigned char *bytes_s, int len_s, + const unsigned char *bytes_B, int len_B, + const unsigned char **bytes_M, int *len_M) { - mpz_t B; mpz_init(B); mpz_from_bin(bytes_B, len_B, B); - mpz_t u; mpz_init(u); - mpz_t x; mpz_init(x); - mpz_t k; mpz_init(k); - mpz_t v; mpz_init(v); - mpz_t tmp1; mpz_init(tmp1); - mpz_t tmp2; mpz_init(tmp2); - mpz_t tmp3; mpz_init(tmp3); - mpz_t tmp4; mpz_init(tmp4); + mpz_t B; mpz_init(B); mpz_from_bin(bytes_B, len_B, B); + mpz_t u; mpz_init(u); + mpz_t x; mpz_init(x); + mpz_t k; mpz_init(k); + mpz_t v; mpz_init(v); + mpz_t tmp1; mpz_init(tmp1); + mpz_t tmp2; mpz_init(tmp2); + mpz_t tmp3; mpz_init(tmp3); + mpz_t tmp4; mpz_init(tmp4); - *len_M = 0; - *bytes_M = 0; + *len_M = 0; + *bytes_M = 0; - if (!H_nn(u, usr->hash_alg, usr->ng->N, usr->A, B)) - goto cleanup_and_exit; + if (!H_nn(u, usr->hash_alg, usr->ng->N, usr->A, B)) + goto cleanup_and_exit; - srp_dbg_num(u, "Client calculated u: "); + srp_dbg_num(u, "Client calculated u: "); - if (!calculate_x( x, usr->hash_alg, bytes_s, len_s, usr->username_verifier, usr->password, usr->password_len )) - goto cleanup_and_exit; + if (!calculate_x(x, usr->hash_alg, bytes_s, len_s, + usr->username_verifier, usr->password, usr->password_len)) + goto cleanup_and_exit; - srp_dbg_num(x, "Client calculated x: "); + srp_dbg_num(x, "Client calculated x: "); - if (!H_nn(k, usr->hash_alg, usr->ng->N, usr->ng->N, usr->ng->g)) - goto cleanup_and_exit; + if (!H_nn(k, usr->hash_alg, usr->ng->N, usr->ng->N, usr->ng->g)) + goto cleanup_and_exit; - /* SRP-6a safety check */ - if ( mpz_sgn(B) != 0 && mpz_sgn(u) != 0 ) - { - mpz_powm(v, usr->ng->g, x, usr->ng->N); + /* SRP-6a safety check */ + if ( mpz_sgn(B) != 0 && mpz_sgn(u) != 0 ) { + mpz_powm(v, usr->ng->g, x, usr->ng->N); - srp_dbg_num(v, "Client calculated v: "); + srp_dbg_num(v, "Client calculated v: "); - /* S = (B - k*(g^x)) ^ (a + ux) */ - mpz_mul(tmp1, u, x); - mpz_add(tmp2, usr->a, tmp1); /* tmp2 = (a + ux) */ - mpz_powm(tmp1, usr->ng->g, x, usr->ng->N); /* tmp1 = g^x */ - mpz_mulm(tmp3, k, tmp1, usr->ng->N, tmp4); /* tmp3 = k*(g^x) */ - mpz_subm(tmp1, B, tmp3, usr->ng->N, tmp4); /* tmp1 = (B - K*(g^x)) */ - mpz_powm(usr->S, tmp1, tmp2, usr->ng->N); + /* S = (B - k*(g^x)) ^ (a + ux) */ + mpz_mul(tmp1, u, x); + mpz_add(tmp2, usr->a, tmp1); /* tmp2 = (a + ux) */ + mpz_powm(tmp1, usr->ng->g, x, usr->ng->N); /* tmp1 = g^x */ + mpz_mulm(tmp3, k, tmp1, usr->ng->N, tmp4); /* tmp3 = k*(g^x) */ + mpz_subm(tmp1, B, tmp3, usr->ng->N, tmp4); /* tmp1 = (B - K*(g^x)) */ + mpz_powm(usr->S, tmp1, tmp2, usr->ng->N); - hash_num(usr->hash_alg, usr->S, usr->session_key); + hash_num(usr->hash_alg, usr->S, usr->session_key); - calculate_M( usr->hash_alg, usr->ng, usr->M, usr->username, bytes_s, len_s, usr->A, B, usr->session_key ); - calculate_H_AMK( usr->hash_alg, usr->H_AMK, usr->A, usr->M, usr->session_key ); + calculate_M( usr->hash_alg, usr->ng, usr->M, usr->username, bytes_s, len_s, usr->A,B, usr->session_key ); + calculate_H_AMK( usr->hash_alg, usr->H_AMK, usr->A, usr->M, usr->session_key ); - *bytes_M = usr->M; - if (len_M) - *len_M = hash_length( usr->hash_alg ); - } - else - { - *bytes_M = NULL; - if (len_M) - *len_M = 0; - } + *bytes_M = usr->M; + if (len_M) + *len_M = hash_length( usr->hash_alg ); + } else { + *bytes_M = NULL; + if (len_M) + *len_M = 0; + } - cleanup_and_exit: +cleanup_and_exit: - mpz_clear(B); - mpz_clear(u); - mpz_clear(x); - mpz_clear(k); - mpz_clear(v); - mpz_clear(tmp1); - mpz_clear(tmp2); - mpz_clear(tmp3); - mpz_clear(tmp4); + mpz_clear(B); + mpz_clear(u); + mpz_clear(x); + mpz_clear(k); + mpz_clear(v); + mpz_clear(tmp1); + mpz_clear(tmp2); + mpz_clear(tmp3); + mpz_clear(tmp4); } -void srp_user_verify_session( struct SRPUser * usr, const unsigned char * bytes_HAMK ) +void srp_user_verify_session(struct SRPUser *usr, const unsigned char *bytes_HAMK) { - if ( memcmp( usr->H_AMK, bytes_HAMK, hash_length(usr->hash_alg) ) == 0 ) - usr->authenticated = 1; + if (memcmp(usr->H_AMK, bytes_HAMK, hash_length(usr->hash_alg)) == 0) + usr->authenticated = 1; } diff --git a/srp.h b/srp.h index 0929647..fcd13f9 100644 --- a/srp.h +++ b/srp.h @@ -62,20 +62,20 @@ struct SRPUser; typedef enum { - SRP_NG_1024, - SRP_NG_2048, - SRP_NG_4096, - SRP_NG_8192, - SRP_NG_CUSTOM + SRP_NG_1024, + SRP_NG_2048, + SRP_NG_4096, + SRP_NG_8192, + SRP_NG_CUSTOM } SRP_NGType; typedef enum { - SRP_SHA1, - /*SRP_SHA224,*/ - SRP_SHA256, - /*SRP_SHA384, - SRP_SHA512*/ + SRP_SHA1, + /*SRP_SHA224,*/ + SRP_SHA256, + /*SRP_SHA384, + SRP_SHA512*/ } SRP_HashAlgorithm; /* Out: bytes_v, len_v @@ -88,11 +88,11 @@ typedef enum * If bytes_s == NULL, it is filled with random data. The caller is responsible for freeing. */ void srp_create_salted_verification_key( SRP_HashAlgorithm alg, - SRP_NGType ng_type, const char * username_for_verifier, - const unsigned char * password, int len_password, - const unsigned char ** bytes_s, int * len_s, - const unsigned char ** bytes_v, int * len_v, - const char * n_hex, const char * g_hex ); + SRP_NGType ng_type, const char * username_for_verifier, + const unsigned char * password, int len_password, + const unsigned char ** bytes_s, int * len_s, + const unsigned char ** bytes_v, int * len_v, + const char * n_hex, const char * g_hex ); /* Out: bytes_B, len_B. * @@ -102,69 +102,70 @@ void srp_create_salted_verification_key( SRP_HashAlgorithm alg, * * If bytes_b == NULL, random data is used for b. */ -struct SRPVerifier * srp_verifier_new( SRP_HashAlgorithm alg, SRP_NGType ng_type, const char * username, - const unsigned char * bytes_s, int len_s, - const unsigned char * bytes_v, int len_v, - const unsigned char * bytes_A, int len_A, - const unsigned char * bytes_b, int len_b, - const unsigned char ** bytes_B, int * len_B, - const char * n_hex, const char * g_hex ); +struct SRPVerifier* srp_verifier_new( SRP_HashAlgorithm alg, SRP_NGType ng_type, + const char * username, + const unsigned char* bytes_s, int len_s, + const unsigned char* bytes_v, int len_v, + const unsigned char* bytes_A, int len_A, + const unsigned char* bytes_b, int len_b, + const unsigned char** bytes_B, int* len_B, + const char* n_hex, const char* g_hex ); -void srp_verifier_delete( struct SRPVerifier * ver ); +void srp_verifier_delete( struct SRPVerifier* ver ); -int srp_verifier_is_authenticated( struct SRPVerifier * ver ); +int srp_verifier_is_authenticated( struct SRPVerifier* ver ); -const char * srp_verifier_get_username( struct SRPVerifier * ver ); +const char * srp_verifier_get_username( struct SRPVerifier* ver ); /* key_length may be null */ -const unsigned char * srp_verifier_get_session_key( struct SRPVerifier * ver, int * key_length ); +const unsigned char* srp_verifier_get_session_key( struct SRPVerifier* ver, + int* key_length ); -int srp_verifier_get_session_key_length( struct SRPVerifier * ver ); +int srp_verifier_get_session_key_length( struct SRPVerifier* ver ); /* user_M must be exactly srp_verifier_get_session_key_length() bytes in size */ -void srp_verifier_verify_session( struct SRPVerifier * ver, - const unsigned char * user_M, - const unsigned char ** bytes_HAMK ); +void srp_verifier_verify_session( struct SRPVerifier* ver, + const unsigned char* user_M, const unsigned char** bytes_HAMK ); /*******************************************************************************/ /* The n_hex and g_hex parameters should be 0 unless SRP_NG_CUSTOM is used for ng_type */ -struct SRPUser * srp_user_new( SRP_HashAlgorithm alg, SRP_NGType ng_type, - const char * username, const char * username_for_verifier, - const unsigned char * bytes_password, int len_password, - const char * n_hex, const char * g_hex ); +struct SRPUser* srp_user_new(SRP_HashAlgorithm alg, SRP_NGType ng_type, + const char* username, const char* username_for_verifier, + const unsigned char* bytes_password, int len_password, + const char* n_hex, const char* g_hex); -void srp_user_delete( struct SRPUser * usr ); +void srp_user_delete(struct SRPUser * usr); -int srp_user_is_authenticated( struct SRPUser * usr); +int srp_user_is_authenticated(struct SRPUser * usr); -const char * srp_user_get_username( struct SRPUser * usr ); +const char* srp_user_get_username(struct SRPUser * usr); /* key_length may be null */ -const unsigned char * srp_user_get_session_key( struct SRPUser * usr, int * key_length ); +const unsigned char* srp_user_get_session_key(struct SRPUser* usr, int* key_length); -int srp_user_get_session_key_length( struct SRPUser * usr ); +int srp_user_get_session_key_length(struct SRPUser* usr); /* Output: username, bytes_A, len_A. If you don't want it get written, set username to NULL. * If bytes_a == NULL, random data is used for a. */ -void srp_user_start_authentication( struct SRPUser * usr, const char ** username, - const unsigned char * bytes_a, int len_a, - const unsigned char ** bytes_A, int * len_A ); +void srp_user_start_authentication(struct SRPUser* usr, const char** username, + const unsigned char* bytes_a, int len_a, + const unsigned char** bytes_A, int* len_A); /* Output: bytes_M, len_M (len_M may be null and will always be * srp_user_get_session_key_length() bytes in size) */ -void srp_user_process_challenge( struct SRPUser * usr, - const unsigned char * bytes_s, int len_s, - const unsigned char * bytes_B, int len_B, - const unsigned char ** bytes_M, int * len_M ); +void srp_user_process_challenge(struct SRPUser * usr, + const unsigned char * bytes_s, int len_s, + const unsigned char * bytes_B, int len_B, + const unsigned char ** bytes_M, int * len_M); /* bytes_HAMK must be exactly srp_user_get_session_key_length() bytes in size */ -void srp_user_verify_session( struct SRPUser * usr, const unsigned char * bytes_HAMK ); +void srp_user_verify_session(struct SRPUser* usr, const unsigned char* bytes_HAMK); #endif /* Include Guard */ diff --git a/test_srp.c b/test_srp.c index 92b22b7..af4076e 100644 --- a/test_srp.c +++ b/test_srp.c @@ -13,333 +13,316 @@ unsigned long long get_usec() { - struct timeval t; - gettimeofday(&t, NULL); - return (((unsigned long long)t.tv_sec) * 1000000) + t.tv_usec; + struct timeval t; + gettimeofday(&t, NULL); + return (((unsigned long long)t.tv_sec) * 1000000) + t.tv_usec; } // The test vectors from // https://tools.ietf.org/html/rfc5054#appendix-B static const char srp_5054_salt[] = { - 0xBE, 0xB2, 0x53, 0x79, 0xD1, 0xA8, 0x58, 0x1E, - 0xB5, 0xA7, 0x27, 0x67, 0x3A, 0x24, 0x41, 0xEE, + 0xBE, 0xB2, 0x53, 0x79, 0xD1, 0xA8, 0x58, 0x1E, + 0xB5, 0xA7, 0x27, 0x67, 0x3A, 0x24, 0x41, 0xEE, }; static const char srp_5054_v[] = { - 0x7E, 0x27, 0x3D, 0xE8, 0x69, 0x6F, 0xFC, 0x4F, - 0x4E, 0x33, 0x7D, 0x05, 0xB4, 0xB3, 0x75, 0xBE, - 0xB0, 0xDD, 0xE1, 0x56, 0x9E, 0x8F, 0xA0, 0x0A, - 0x98, 0x86, 0xD8, 0x12, 0x9B, 0xAD, 0xA1, 0xF1, - 0x82, 0x22, 0x23, 0xCA, 0x1A, 0x60, 0x5B, 0x53, - 0x0E, 0x37, 0x9B, 0xA4, 0x72, 0x9F, 0xDC, 0x59, - 0xF1, 0x05, 0xB4, 0x78, 0x7E, 0x51, 0x86, 0xF5, - 0xC6, 0x71, 0x08, 0x5A, 0x14, 0x47, 0xB5, 0x2A, - 0x48, 0xCF, 0x19, 0x70, 0xB4, 0xFB, 0x6F, 0x84, - 0x00, 0xBB, 0xF4, 0xCE, 0xBF, 0xBB, 0x16, 0x81, - 0x52, 0xE0, 0x8A, 0xB5, 0xEA, 0x53, 0xD1, 0x5C, - 0x1A, 0xFF, 0x87, 0xB2, 0xB9, 0xDA, 0x6E, 0x04, - 0xE0, 0x58, 0xAD, 0x51, 0xCC, 0x72, 0xBF, 0xC9, - 0x03, 0x3B, 0x56, 0x4E, 0x26, 0x48, 0x0D, 0x78, - 0xE9, 0x55, 0xA5, 0xE2, 0x9E, 0x7A, 0xB2, 0x45, - 0xDB, 0x2B, 0xE3, 0x15, 0xE2, 0x09, 0x9A, 0xFB, + 0x7E, 0x27, 0x3D, 0xE8, 0x69, 0x6F, 0xFC, 0x4F, + 0x4E, 0x33, 0x7D, 0x05, 0xB4, 0xB3, 0x75, 0xBE, + 0xB0, 0xDD, 0xE1, 0x56, 0x9E, 0x8F, 0xA0, 0x0A, + 0x98, 0x86, 0xD8, 0x12, 0x9B, 0xAD, 0xA1, 0xF1, + 0x82, 0x22, 0x23, 0xCA, 0x1A, 0x60, 0x5B, 0x53, + 0x0E, 0x37, 0x9B, 0xA4, 0x72, 0x9F, 0xDC, 0x59, + 0xF1, 0x05, 0xB4, 0x78, 0x7E, 0x51, 0x86, 0xF5, + 0xC6, 0x71, 0x08, 0x5A, 0x14, 0x47, 0xB5, 0x2A, + 0x48, 0xCF, 0x19, 0x70, 0xB4, 0xFB, 0x6F, 0x84, + 0x00, 0xBB, 0xF4, 0xCE, 0xBF, 0xBB, 0x16, 0x81, + 0x52, 0xE0, 0x8A, 0xB5, 0xEA, 0x53, 0xD1, 0x5C, + 0x1A, 0xFF, 0x87, 0xB2, 0xB9, 0xDA, 0x6E, 0x04, + 0xE0, 0x58, 0xAD, 0x51, 0xCC, 0x72, 0xBF, 0xC9, + 0x03, 0x3B, 0x56, 0x4E, 0x26, 0x48, 0x0D, 0x78, + 0xE9, 0x55, 0xA5, 0xE2, 0x9E, 0x7A, 0xB2, 0x45, + 0xDB, 0x2B, 0xE3, 0x15, 0xE2, 0x09, 0x9A, 0xFB, }; static const char srp_5054_a[] = { - 0x60, 0x97, 0x55, 0x27, 0x03, 0x5C, 0xF2, 0xAD, - 0x19, 0x89, 0x80, 0x6F, 0x04, 0x07, 0x21, 0x0B, - 0xC8, 0x1E, 0xDC, 0x04, 0xE2, 0x76, 0x2A, 0x56, - 0xAF, 0xD5, 0x29, 0xDD, 0xDA, 0x2D, 0x43, 0x93, + 0x60, 0x97, 0x55, 0x27, 0x03, 0x5C, 0xF2, 0xAD, + 0x19, 0x89, 0x80, 0x6F, 0x04, 0x07, 0x21, 0x0B, + 0xC8, 0x1E, 0xDC, 0x04, 0xE2, 0x76, 0x2A, 0x56, + 0xAF, 0xD5, 0x29, 0xDD, 0xDA, 0x2D, 0x43, 0x93, }; static const char srp_5054_A[] = { - 0x61, 0xD5, 0xE4, 0x90, 0xF6, 0xF1, 0xB7, 0x95, - 0x47, 0xB0, 0x70, 0x4C, 0x43, 0x6F, 0x52, 0x3D, - 0xD0, 0xE5, 0x60, 0xF0, 0xC6, 0x41, 0x15, 0xBB, - 0x72, 0x55, 0x7E, 0xC4, 0x43, 0x52, 0xE8, 0x90, - 0x32, 0x11, 0xC0, 0x46, 0x92, 0x27, 0x2D, 0x8B, - 0x2D, 0x1A, 0x53, 0x58, 0xA2, 0xCF, 0x1B, 0x6E, - 0x0B, 0xFC, 0xF9, 0x9F, 0x92, 0x15, 0x30, 0xEC, - 0x8E, 0x39, 0x35, 0x61, 0x79, 0xEA, 0xE4, 0x5E, - 0x42, 0xBA, 0x92, 0xAE, 0xAC, 0xED, 0x82, 0x51, - 0x71, 0xE1, 0xE8, 0xB9, 0xAF, 0x6D, 0x9C, 0x03, - 0xE1, 0x32, 0x7F, 0x44, 0xBE, 0x08, 0x7E, 0xF0, - 0x65, 0x30, 0xE6, 0x9F, 0x66, 0x61, 0x52, 0x61, - 0xEE, 0xF5, 0x40, 0x73, 0xCA, 0x11, 0xCF, 0x58, - 0x58, 0xF0, 0xED, 0xFD, 0xFE, 0x15, 0xEF, 0xEA, - 0xB3, 0x49, 0xEF, 0x5D, 0x76, 0x98, 0x8A, 0x36, - 0x72, 0xFA, 0xC4, 0x7B, 0x07, 0x69, 0x44, 0x7B, + 0x61, 0xD5, 0xE4, 0x90, 0xF6, 0xF1, 0xB7, 0x95, + 0x47, 0xB0, 0x70, 0x4C, 0x43, 0x6F, 0x52, 0x3D, + 0xD0, 0xE5, 0x60, 0xF0, 0xC6, 0x41, 0x15, 0xBB, + 0x72, 0x55, 0x7E, 0xC4, 0x43, 0x52, 0xE8, 0x90, + 0x32, 0x11, 0xC0, 0x46, 0x92, 0x27, 0x2D, 0x8B, + 0x2D, 0x1A, 0x53, 0x58, 0xA2, 0xCF, 0x1B, 0x6E, + 0x0B, 0xFC, 0xF9, 0x9F, 0x92, 0x15, 0x30, 0xEC, + 0x8E, 0x39, 0x35, 0x61, 0x79, 0xEA, 0xE4, 0x5E, + 0x42, 0xBA, 0x92, 0xAE, 0xAC, 0xED, 0x82, 0x51, + 0x71, 0xE1, 0xE8, 0xB9, 0xAF, 0x6D, 0x9C, 0x03, + 0xE1, 0x32, 0x7F, 0x44, 0xBE, 0x08, 0x7E, 0xF0, + 0x65, 0x30, 0xE6, 0x9F, 0x66, 0x61, 0x52, 0x61, + 0xEE, 0xF5, 0x40, 0x73, 0xCA, 0x11, 0xCF, 0x58, + 0x58, 0xF0, 0xED, 0xFD, 0xFE, 0x15, 0xEF, 0xEA, + 0xB3, 0x49, 0xEF, 0x5D, 0x76, 0x98, 0x8A, 0x36, + 0x72, 0xFA, 0xC4, 0x7B, 0x07, 0x69, 0x44, 0x7B, }; static const char srp_5054_b[] = { - 0xE4, 0x87, 0xCB, 0x59, 0xD3, 0x1A, 0xC5, 0x50, - 0x47, 0x1E, 0x81, 0xF0, 0x0F, 0x69, 0x28, 0xE0, - 0x1D, 0xDA, 0x08, 0xE9, 0x74, 0xA0, 0x04, 0xF4, - 0x9E, 0x61, 0xF5, 0xD1, 0x05, 0x28, 0x4D, 0x20, + 0xE4, 0x87, 0xCB, 0x59, 0xD3, 0x1A, 0xC5, 0x50, + 0x47, 0x1E, 0x81, 0xF0, 0x0F, 0x69, 0x28, 0xE0, + 0x1D, 0xDA, 0x08, 0xE9, 0x74, 0xA0, 0x04, 0xF4, + 0x9E, 0x61, 0xF5, 0xD1, 0x05, 0x28, 0x4D, 0x20, }; static const char srp_5054_B[] = { - 0xBD, 0x0C, 0x61, 0x51, 0x2C, 0x69, 0x2C, 0x0C, - 0xB6, 0xD0, 0x41, 0xFA, 0x01, 0xBB, 0x15, 0x2D, - 0x49, 0x16, 0xA1, 0xE7, 0x7A, 0xF4, 0x6A, 0xE1, - 0x05, 0x39, 0x30, 0x11, 0xBA, 0xF3, 0x89, 0x64, - 0xDC, 0x46, 0xA0, 0x67, 0x0D, 0xD1, 0x25, 0xB9, - 0x5A, 0x98, 0x16, 0x52, 0x23, 0x6F, 0x99, 0xD9, - 0xB6, 0x81, 0xCB, 0xF8, 0x78, 0x37, 0xEC, 0x99, - 0x6C, 0x6D, 0xA0, 0x44, 0x53, 0x72, 0x86, 0x10, - 0xD0, 0xC6, 0xDD, 0xB5, 0x8B, 0x31, 0x88, 0x85, - 0xD7, 0xD8, 0x2C, 0x7F, 0x8D, 0xEB, 0x75, 0xCE, - 0x7B, 0xD4, 0xFB, 0xAA, 0x37, 0x08, 0x9E, 0x6F, - 0x9C, 0x60, 0x59, 0xF3, 0x88, 0x83, 0x8E, 0x7A, - 0x00, 0x03, 0x0B, 0x33, 0x1E, 0xB7, 0x68, 0x40, - 0x91, 0x04, 0x40, 0xB1, 0xB2, 0x7A, 0xAE, 0xAE, - 0xEB, 0x40, 0x12, 0xB7, 0xD7, 0x66, 0x52, 0x38, - 0xA8, 0xE3, 0xFB, 0x00, 0x4B, 0x11, 0x7B, 0x58, + 0xBD, 0x0C, 0x61, 0x51, 0x2C, 0x69, 0x2C, 0x0C, + 0xB6, 0xD0, 0x41, 0xFA, 0x01, 0xBB, 0x15, 0x2D, + 0x49, 0x16, 0xA1, 0xE7, 0x7A, 0xF4, 0x6A, 0xE1, + 0x05, 0x39, 0x30, 0x11, 0xBA, 0xF3, 0x89, 0x64, + 0xDC, 0x46, 0xA0, 0x67, 0x0D, 0xD1, 0x25, 0xB9, + 0x5A, 0x98, 0x16, 0x52, 0x23, 0x6F, 0x99, 0xD9, + 0xB6, 0x81, 0xCB, 0xF8, 0x78, 0x37, 0xEC, 0x99, + 0x6C, 0x6D, 0xA0, 0x44, 0x53, 0x72, 0x86, 0x10, + 0xD0, 0xC6, 0xDD, 0xB5, 0x8B, 0x31, 0x88, 0x85, + 0xD7, 0xD8, 0x2C, 0x7F, 0x8D, 0xEB, 0x75, 0xCE, + 0x7B, 0xD4, 0xFB, 0xAA, 0x37, 0x08, 0x9E, 0x6F, + 0x9C, 0x60, 0x59, 0xF3, 0x88, 0x83, 0x8E, 0x7A, + 0x00, 0x03, 0x0B, 0x33, 0x1E, 0xB7, 0x68, 0x40, + 0x91, 0x04, 0x40, 0xB1, 0xB2, 0x7A, 0xAE, 0xAE, + 0xEB, 0x40, 0x12, 0xB7, 0xD7, 0x66, 0x52, 0x38, + 0xA8, 0xE3, 0xFB, 0x00, 0x4B, 0x11, 0x7B, 0x58, }; // This isn't used (yet) static const char srp_5054_u[] = { - 0xCE, 0x38, 0xB9, 0x59, 0x34, 0x87, 0xDA, 0x98, - 0x55, 0x4E, 0xD4, 0x7D, 0x70, 0xA7, 0xAE, 0x5F, - 0x46, 0x2E, 0xF0, 0x19, + 0xCE, 0x38, 0xB9, 0x59, 0x34, 0x87, 0xDA, 0x98, + 0x55, 0x4E, 0xD4, 0x7D, 0x70, 0xA7, 0xAE, 0x5F, + 0x46, 0x2E, 0xF0, 0x19, }; // This is SHA-1() static const char srp_5054_S[] = { - 0x01, 0x7e, 0xef, 0xa1, 0xce, 0xfc, 0x5c, 0x2e, - 0x62, 0x6e, 0x21, 0x59, 0x89, 0x87, 0xf3, 0x1e, - 0x0f, 0x1b, 0x11, 0xbb, + 0x01, 0x7e, 0xef, 0xa1, 0xce, 0xfc, 0x5c, 0x2e, + 0x62, 0x6e, 0x21, 0x59, 0x89, 0x87, 0xf3, 0x1e, + 0x0f, 0x1b, 0x11, 0xbb, }; int test_rfc_5054_compat() { - struct SRPVerifier * ver; - struct SRPUser * usr; + struct SRPVerifier *ver; + struct SRPUser *usr; - const unsigned char * bytes_s = (const unsigned char *) srp_5054_salt; - const unsigned char * bytes_v = 0; - const unsigned char * bytes_A = 0; - const unsigned char * bytes_B = 0; + const unsigned char *bytes_s = (const unsigned char *) srp_5054_salt; + const unsigned char * bytes_v = 0; + const unsigned char * bytes_A = 0; + const unsigned char * bytes_B = 0; - const unsigned char * bytes_M = 0; - const unsigned char * bytes_HAMK = 0; - const unsigned char * bytes_S = 0; + const unsigned char * bytes_M = 0; + const unsigned char * bytes_HAMK = 0; + const unsigned char * bytes_S = 0; - int len_s = 16; - int len_v = 0; - int len_A = 0; - int len_B = 0; - int len_M = 0; - int len_S = 0; - int i; + int len_s = 16; + int len_v = 0; + int len_A = 0; + int len_B = 0; + int len_M = 0; + int len_S = 0; + int i; - const char * username = "alice"; - const char * password = "password123"; + const char *username = "alice"; + const char *password = "password123"; - SRP_HashAlgorithm alg = SRP_SHA1; - SRP_NGType ng_type = SRP_NG_1024; //TEST_NG; + SRP_HashAlgorithm alg = SRP_SHA1; + SRP_NGType ng_type = SRP_NG_1024; //TEST_NG; - printf("Testing RFC 5054 test vectors..."); + printf("Testing RFC 5054 test vectors..."); - srp_create_salted_verification_key( alg, ng_type, username, - (const unsigned char *)password, - strlen(password), &bytes_s, &len_s, &bytes_v, &len_v, NULL, NULL ); + srp_create_salted_verification_key(alg, ng_type, username, + (const unsigned char *)password, + strlen(password), &bytes_s, &len_s, &bytes_v, &len_v, NULL, NULL ); - if (len_v != 128 || memcmp(&srp_5054_v, bytes_v, len_v) != 0) - { - printf(" computed v doesn't match!\n"); - return 1; - } + if (len_v != 128 || memcmp(&srp_5054_v, bytes_v, len_v) != 0) { + printf(" computed v doesn't match!\n"); + return 1; + } - usr = srp_user_new( alg, ng_type, username, username, - (const unsigned char *)password, - strlen(password), NULL, NULL ); + usr = srp_user_new(alg, ng_type, username, username, + (const unsigned char *)password, + strlen(password), NULL, NULL); - srp_user_start_authentication( usr, NULL, srp_5054_a, 32, &bytes_A, &len_A ); + srp_user_start_authentication(usr, NULL, srp_5054_a, 32, &bytes_A, &len_A); - if (memcmp(&srp_5054_A, bytes_A, len_A) != 0) - { - printf(" computed A doesn't match!\n"); - return 1; - } + if (memcmp(&srp_5054_A, bytes_A, len_A) != 0) { + printf(" computed A doesn't match!\n"); + return 1; + } - /* User -> Host: (username, bytes_A) */ - ver = srp_verifier_new( alg, ng_type, username, (const unsigned char *) srp_5054_salt, - len_s, bytes_v, len_v, bytes_A, len_A, srp_5054_b, 32, &bytes_B, - &len_B, NULL, NULL ); + /* User -> Host: (username, bytes_A) */ + ver = srp_verifier_new(alg, ng_type, username, (const unsigned char *) srp_5054_salt, + len_s, bytes_v, len_v, bytes_A, len_A, srp_5054_b, 32, &bytes_B, + &len_B, NULL, NULL); - if ( !bytes_B ) - { - printf(" SRP-6a safety check violated for B!\n"); - return 1; - } + if (!bytes_B) { + printf(" SRP-6a safety check violated for B!\n"); + return 1; + } - if (memcmp(&srp_5054_B, bytes_B, len_B) != 0) - { - printf(" computed B doesn't match!\n"); - return 1; - } + if (memcmp(&srp_5054_B, bytes_B, len_B) != 0) { + printf(" computed B doesn't match!\n"); + return 1; + } - /* Host -> User: (bytes_s, bytes_B) */ - srp_user_process_challenge( usr, (const unsigned char *) srp_5054_salt, len_s, bytes_B, len_B, &bytes_M, &len_M ); + /* Host -> User: (bytes_s, bytes_B) */ + srp_user_process_challenge(usr, (const unsigned char *) srp_5054_salt, len_s, bytes_B,len_B, &bytes_M, &len_M); - if ( !bytes_M ) - { - printf(" SRP-6a safety check violated for M!\n"); - goto cleanup; - } + if (!bytes_M) { + printf(" SRP-6a safety check violated for M!\n"); + goto cleanup; + } - /* User -> Host: (bytes_M) */ - srp_verifier_verify_session( ver, bytes_M, &bytes_HAMK ); + /* User -> Host: (bytes_M) */ + srp_verifier_verify_session(ver, bytes_M, &bytes_HAMK); - if ( !bytes_HAMK ) - { - printf(" user authentication failed!\n"); - goto cleanup; - } + if (!bytes_HAMK) { + printf(" user authentication failed!\n"); + goto cleanup; + } - /* Host -> User: (HAMK) */ - srp_user_verify_session( usr, bytes_HAMK ); + /* Host -> User: (HAMK) */ + srp_user_verify_session(usr, bytes_HAMK); - if ( !srp_user_is_authenticated(usr) ) - { - printf(" server authentication failed!\n"); - } + if (!srp_user_is_authenticated(usr)) { + printf(" server authentication failed!\n"); + } - bytes_S = srp_verifier_get_session_key(ver, &len_S); + bytes_S = srp_verifier_get_session_key(ver, &len_S); - if (memcmp(&srp_5054_S, bytes_S, len_S) != 0) - { - printf(" computed session key doesn't match!\n"); - return 1; - } + if (memcmp(&srp_5054_S, bytes_S, len_S) != 0) { + printf(" computed session key doesn't match!\n"); + return 1; + } - printf(" success.\n"); - - cleanup: - srp_verifier_delete( ver ); - srp_user_delete( usr ); - - free( (char *)bytes_v ); - - return 0; -} - -const char * test_n_hex = "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496" - "EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8E" - "F4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA" - "9AFD5138FE8376435B9FC61D2FC0EB06E3"; -const char * test_g_hex = "2"; - -int main( int argc, char * argv[] ) -{ - test_rfc_5054_compat(); - printf("Performing the speedtest.\n"); - - struct SRPVerifier * ver; - struct SRPUser * usr; - - const unsigned char * bytes_s = 0; - const unsigned char * bytes_v = 0; - const unsigned char * bytes_A = 0; - const unsigned char * bytes_B = 0; - - const unsigned char * bytes_M = 0; - const unsigned char * bytes_HAMK = 0; - - int len_s = 0; - int len_v = 0; - int len_A = 0; - int len_B = 0; - int len_M = 0; - int i; - - unsigned long long start; - unsigned long long duration; - - const char * username = "TestUser"; - const char * ver_unam = "testuser"; - const char * password = "password"; - - const char * n_hex = 0; - const char * g_hex = 0; - - SRP_HashAlgorithm alg = TEST_HASH; - SRP_NGType ng_type = SRP_NG_8192; //TEST_NG; - - if (ng_type == SRP_NG_CUSTOM) - { - n_hex = test_n_hex; - g_hex = test_g_hex; - } - - - srp_create_salted_verification_key( alg, ng_type, ver_unam, - (const unsigned char *)password, - strlen(password), - &bytes_s, &len_s, &bytes_v, &len_v, n_hex, g_hex ); - - - - start = get_usec(); - - for( i = 0; i < NITER; i++ ) - { - usr = srp_user_new( alg, ng_type, username, ver_unam, - (const unsigned char *)password, - strlen(password), n_hex, g_hex ); - - srp_user_start_authentication( usr, NULL, NULL, 0, &bytes_A, &len_A ); - - /* User -> Host: (username, bytes_A) */ - ver = srp_verifier_new( alg, ng_type, username, bytes_s, len_s, bytes_v, len_v, - bytes_A, len_A, NULL, 0, & bytes_B, &len_B, n_hex, g_hex ); - - if ( !bytes_B ) - { - printf("Verifier SRP-6a safety check violated!\n"); - goto cleanup; - } - - /* Host -> User: (bytes_s, bytes_B) */ - srp_user_process_challenge( usr, bytes_s, len_s, bytes_B, len_B, &bytes_M, &len_M ); - - if ( !bytes_M ) - { - printf("User SRP-6a safety check violation!\n"); - goto cleanup; - } - - /* User -> Host: (bytes_M) */ - srp_verifier_verify_session( ver, bytes_M, &bytes_HAMK ); - - if ( !bytes_HAMK ) - { - printf("User authentication failed!\n"); - goto cleanup; - } - - /* Host -> User: (HAMK) */ - srp_user_verify_session( usr, bytes_HAMK ); - - if ( !srp_user_is_authenticated(usr) ) - { - printf("Server authentication failed!\n"); - } + printf(" success.\n"); cleanup: - srp_verifier_delete( ver ); - srp_user_delete( usr ); - } + srp_verifier_delete(ver); + srp_user_delete(usr); - duration = get_usec() - start; + free((char *)bytes_v); - printf("Usec per call: %d\n", (int)(duration / NITER)); - - - free( (char *)bytes_s ); - free( (char *)bytes_v ); - - return 0; + return 0; +} + +const char * test_n_hex = + "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496" + "EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8E" + "F4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA" + "9AFD5138FE8376435B9FC61D2FC0EB06E3"; +const char * test_g_hex = "2"; + +int main(int argc, char * argv[]) +{ + test_rfc_5054_compat(); + printf("Performing the speedtest.\n"); + + struct SRPVerifier *ver; + struct SRPUser *usr; + + const unsigned char *bytes_s = 0; + const unsigned char *bytes_v = 0; + const unsigned char *bytes_A = 0; + const unsigned char *bytes_B = 0; + + const unsigned char *bytes_M = 0; + const unsigned char *bytes_HAMK = 0; + + int len_s = 0; + int len_v = 0; + int len_A = 0; + int len_B = 0; + int len_M = 0; + int i; + + unsigned long long start; + unsigned long long duration; + + const char *username = "TestUser"; + const char *ver_unam = "testuser"; + const char *password = "password"; + + const char *n_hex = 0; + const char *g_hex = 0; + + SRP_HashAlgorithm alg = TEST_HASH; + SRP_NGType ng_type = SRP_NG_8192; //TEST_NG; + + if (ng_type == SRP_NG_CUSTOM) { + n_hex = test_n_hex; + g_hex = test_g_hex; + } + + srp_create_salted_verification_key(alg, ng_type, ver_unam, + (const unsigned char *)password, strlen(password), + &bytes_s, &len_s, &bytes_v, &len_v, n_hex, g_hex); + + start = get_usec(); + + for (i = 0; i < NITER; i++) { + usr = srp_user_new(alg, ng_type, username, ver_unam, + (const unsigned char *)password, + strlen(password), n_hex, g_hex); + + srp_user_start_authentication(usr, NULL, NULL, 0, &bytes_A, &len_A); + + /* User -> Host: (username, bytes_A) */ + ver = srp_verifier_new(alg, ng_type, username, bytes_s, len_s, bytes_v, len_v, + bytes_A, len_A, NULL, 0, & bytes_B, &len_B, n_hex, g_hex); + + if (!bytes_B) { + printf("Verifier SRP-6a safety check violated!\n"); + goto cleanup; + } + + /* Host -> User: (bytes_s, bytes_B) */ + srp_user_process_challenge(usr, bytes_s, len_s, bytes_B, len_B, &bytes_M, &len_M); + + if (!bytes_M) { + printf("User SRP-6a safety check violation!\n"); + goto cleanup; + } + + /* User -> Host: (bytes_M) */ + srp_verifier_verify_session(ver, bytes_M, &bytes_HAMK); + + if (!bytes_HAMK) { + printf("User authentication failed!\n"); + goto cleanup; + } + + /* Host -> User: (HAMK) */ + srp_user_verify_session(usr, bytes_HAMK); + + if (!srp_user_is_authenticated(usr)) { + printf("Server authentication failed!\n"); + } + +cleanup: + srp_verifier_delete(ver); + srp_user_delete(usr); + } + + duration = get_usec() - start; + + printf("Usec per call: %d\n", (int)(duration / NITER)); + + + free((char *)bytes_s); + free((char *)bytes_v); + + return 0; }