Fixing double name in protocol.
This commit is contained in:
+1
-1
@@ -437,7 +437,7 @@ PlainCards ::= SEQUENCE {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EncryptedCards ::= SEQUENCE {
|
EncryptedCards ::= SEQUENCE {
|
||||||
encryptedCards OCTET STRING (SIZE(16..64))
|
cardData OCTET STRING (SIZE(16..64))
|
||||||
}
|
}
|
||||||
|
|
||||||
HandStartMessage ::= [APPLICATION 23] SEQUENCE {
|
HandStartMessage ::= [APPLICATION 23] SEQUENCE {
|
||||||
|
|||||||
@@ -1699,8 +1699,8 @@ ClientStateWaitHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client
|
|||||||
string plainCards;
|
string plainCards;
|
||||||
if (!CryptHelper::AES128Decrypt((const unsigned char *)userPassword.c_str(),
|
if (!CryptHelper::AES128Decrypt((const unsigned char *)userPassword.c_str(),
|
||||||
(unsigned)userPassword.size(),
|
(unsigned)userPassword.size(),
|
||||||
encryptedCards->encryptedCards.buf,
|
encryptedCards->cardData.buf,
|
||||||
encryptedCards->encryptedCards.size,
|
encryptedCards->cardData.size,
|
||||||
plainCards))
|
plainCards))
|
||||||
{
|
{
|
||||||
throw ClientException(__FILE__, __LINE__, ERR_NET_UNKNOWN_PLAYER_ID, 0);
|
throw ClientException(__FILE__, __LINE__, ERR_NET_UNKNOWN_PLAYER_ID, 0);
|
||||||
|
|||||||
+5
-5
@@ -10,7 +10,7 @@
|
|||||||
#include "EncryptedCards.h"
|
#include "EncryptedCards.h"
|
||||||
|
|
||||||
static int
|
static int
|
||||||
memb_encryptedCards_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
|
memb_cardData_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
|
||||||
asn_app_constraint_failed_f *ctfailcb, void *app_key) {
|
asn_app_constraint_failed_f *ctfailcb, void *app_key) {
|
||||||
const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr;
|
const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr;
|
||||||
size_t size;
|
size_t size;
|
||||||
@@ -36,21 +36,21 @@ memb_encryptedCards_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static asn_TYPE_member_t asn_MBR_EncryptedCards_1[] = {
|
static asn_TYPE_member_t asn_MBR_EncryptedCards_1[] = {
|
||||||
{ ATF_NOFLAGS, 0, offsetof(struct EncryptedCards, encryptedCards),
|
{ ATF_NOFLAGS, 0, offsetof(struct EncryptedCards, cardData),
|
||||||
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)),
|
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)),
|
||||||
0,
|
0,
|
||||||
&asn_DEF_OCTET_STRING,
|
&asn_DEF_OCTET_STRING,
|
||||||
memb_encryptedCards_constraint_1,
|
memb_cardData_constraint_1,
|
||||||
0, /* PER is not compiled, use -gen-PER */
|
0, /* PER is not compiled, use -gen-PER */
|
||||||
0,
|
0,
|
||||||
"encryptedCards"
|
"cardData"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
static ber_tlv_tag_t asn_DEF_EncryptedCards_tags_1[] = {
|
static ber_tlv_tag_t asn_DEF_EncryptedCards_tags_1[] = {
|
||||||
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
|
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
|
||||||
};
|
};
|
||||||
static asn_TYPE_tag2member_t asn_MAP_EncryptedCards_tag2el_1[] = {
|
static asn_TYPE_tag2member_t asn_MAP_EncryptedCards_tag2el_1[] = {
|
||||||
{ (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* encryptedCards at 440 */
|
{ (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* cardData at 440 */
|
||||||
};
|
};
|
||||||
static asn_SEQUENCE_specifics_t asn_SPC_EncryptedCards_specs_1 = {
|
static asn_SEQUENCE_specifics_t asn_SPC_EncryptedCards_specs_1 = {
|
||||||
sizeof(struct EncryptedCards),
|
sizeof(struct EncryptedCards),
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ extern "C" {
|
|||||||
|
|
||||||
/* EncryptedCards */
|
/* EncryptedCards */
|
||||||
typedef struct EncryptedCards {
|
typedef struct EncryptedCards {
|
||||||
OCTET_STRING_t encryptedCards;
|
OCTET_STRING_t cardData;
|
||||||
/*
|
/*
|
||||||
* This type is extensible,
|
* This type is extensible,
|
||||||
* possible extensions are below.
|
* possible extensions are below.
|
||||||
|
|||||||
Reference in New Issue
Block a user