abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-07 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

update base58

Browse Source
This commit is contained in:
Zhi Guan
2017-05-20 09:15:16 +08:00
parent 2299b8ff22
commit 3c4cf814b4
4 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/openssl/base58.h
View File

@@ -53,7 +53,31 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
bool base58_decode(const char *b58, size_t b58sz, void *bin, size_t *binszp); bool base58_decode(const char *b58, size_t b58sz, void *bin, size_t *binszp);
bool base58_encode(const void *data, size_t binsz, char *b58, size_t *b58sz); bool base58_encode(const void *data, size_t binsz, char *b58, size_t *b58sz);
/* BEGIN ERROR CODES */
/*
* 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.
*/
int ERR_load_BASE58_strings(void);
/* Error codes for the BASE58 functions. */
/* Function codes. */
# define BASE58_F_BASE58_DECODE 100
/* Reason codes. */
# define BASE58_R_HIGHBIT_SET_ON_INVALID_DIGIT 100
# ifdef __cplusplus
}
# endif
#endif #endif

3
include/openssl/err.h
View File

@@ -107,6 +107,7 @@ typedef struct err_state_st {
# define ERR_LIB_SDF 63 # define ERR_LIB_SDF 63
# define ERR_LIB_SKF 64 # define ERR_LIB_SKF 64
# define ERR_LIB_SOF 65 # define ERR_LIB_SOF 65
# define ERR_LIB_BASE58 66
# define ERR_LIB_USER 128 # define ERR_LIB_USER 128
@@ -159,6 +160,7 @@ typedef struct err_state_st {
# define SDFerr(f,r) ERR_PUT_error(ERR_LIB_SDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define SDFerr(f,r) ERR_PUT_error(ERR_LIB_SDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
# define SKFerr(f,r) ERR_PUT_error(ERR_LIB_SKF,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define SKFerr(f,r) ERR_PUT_error(ERR_LIB_SKF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
# define SOFerr(f,r) ERR_PUT_error(ERR_LIB_SOF,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define SOFerr(f,r) ERR_PUT_error(ERR_LIB_SOF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
# define BASE58err(f,r) ERR_PUT_error(ERR_LIB_BASE58,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
# define ERR_PACK(l,f,r) ( \ # define ERR_PACK(l,f,r) ( \
(((unsigned int)(l) & 0x0FF) << 24L) | \ (((unsigned int)(l) & 0x0FF) << 24L) | \
@@ -220,6 +222,7 @@ typedef struct err_state_st {
# define ERR_R_SDF_LIB ERR_LIB_SDF/* 63 */ # define ERR_R_SDF_LIB ERR_LIB_SDF/* 63 */
# define ERR_R_SKF_LIB ERR_LIB_SKF/* 64 */ # define ERR_R_SKF_LIB ERR_LIB_SKF/* 64 */
# define ERR_R_SOF_LIB ERR_LIB_SOF/* 65 */ # define ERR_R_SOF_LIB ERR_LIB_SOF/* 65 */
# define ERR_R_BASE58_LIB ERR_LIB_BASE58/* 66 */
# define ERR_R_NESTED_ASN1_ERROR 58 # define ERR_R_NESTED_ASN1_ERROR 58

3
test/serpenttest.c
View File

@@ -64,7 +64,7 @@
#include "../e_os.h" #include "../e_os.h"
#ifdef OPENSSL_NO_SERPENT #ifdef OPENSSL_NO_SERPENT
int main(int argc. char **argv) int main(int argc, char **argv)
{ {
printf("No Serpent support\n"); printf("No Serpent support\n");
return 0; return 0;
@@ -171,3 +171,4 @@ int main(void)
} }
return 0; return 0;
} }
#endif

1
util/libcrypto.num
View File

@@ -4842,3 +4842,4 @@ PKCS12_item_decrypt_d2i 4683 1_1_0d EXIST::FUNCTION:
o2i_SM2CiphertextValue 4684 1_1_0d EXIST::FUNCTION: o2i_SM2CiphertextValue 4684 1_1_0d EXIST::FUNCTION:
i2o_SM2CiphertextValue 4685 1_1_0d EXIST::FUNCTION: i2o_SM2CiphertextValue 4685 1_1_0d EXIST::FUNCTION:
SM2_compute_message_digest 4686 1_1_0d EXIST::FUNCTION: SM2_compute_message_digest 4686 1_1_0d EXIST::FUNCTION:
serpent_set_decrypt_key 4687 1_1_0d EXIST::FUNCTION: