diff --git a/include/openssl/base58.h b/include/openssl/base58.h
index 388e4d2d..b111e8c3 100644
--- a/include/openssl/base58.h
+++ b/include/openssl/base58.h
@@ -53,7 +53,31 @@
 #include <stddef.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_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
diff --git a/include/openssl/err.h b/include/openssl/err.h
index e057e591..2b51f5ba 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -107,6 +107,7 @@ typedef struct err_state_st {
 # define ERR_LIB_SDF             63
 # define ERR_LIB_SKF             64
 # define ERR_LIB_SOF             65
+# define ERR_LIB_BASE58          66
 
 # 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 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 BASE58err(f,r) ERR_PUT_error(ERR_LIB_BASE58,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
 
 # define ERR_PACK(l,f,r) ( \
         (((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_SKF_LIB  ERR_LIB_SKF/* 64 */
 # 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
 
diff --git a/test/serpenttest.c b/test/serpenttest.c
index e2395188..180ec03d 100644
--- a/test/serpenttest.c
+++ b/test/serpenttest.c
@@ -64,7 +64,7 @@
 #include "../e_os.h"
 
 #ifdef OPENSSL_NO_SERPENT
-int main(int argc. char **argv)
+int main(int argc, char **argv)
 {
 	printf("No Serpent support\n");
 	return 0;
@@ -171,3 +171,4 @@ int main(void)
 	}
 	return 0;
 }
+#endif
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 37bd3f05..cf5ae2d5 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4842,3 +4842,4 @@ PKCS12_item_decrypt_d2i                 4683	1_1_0d	EXIST::FUNCTION:
 o2i_SM2CiphertextValue                  4684	1_1_0d	EXIST::FUNCTION:
 i2o_SM2CiphertextValue                  4685	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: