Zhi Guan 43fed1108d Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	README.md

2017-02-14 16:13:11 +08:00

..

asm

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

build.info

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

cbc_cksm.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

cbc_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

cfb64ede.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

cfb64enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

cfb_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

des_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

des_locl.h

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

ecb3_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

ecb_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

fcrypt_b.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

fcrypt.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

ncbc_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

ofb64ede.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

ofb64enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

ofb_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

pcbc_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

qud_cksm.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

rand_key.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

rpc_des.h

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

rpc_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

set_key.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

spr.h

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

str2key.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00

xcbc_enc.c

Merge remote-tracking branch 'origin/master'

2017-02-14 16:13:11 +08:00