Update Tools

include/gmssl/cms.h

@@ -327,6 +327,8 @@ RecipientInfo ::= SEQUENCE {
 	keyEncryptionAlgorithm		AlgorithmIdentifier,
 	encryptedKey			OCTET STRING -- DER-encoding of SM2Cipher
 }
+由于encryptedKey的类型为SM2Cipher, 而SM2Cipher中有2个INTEGER，因此长度是不固定的。
+因此不能预先确定输出长度
 */
 int cms_recipient_info_to_der(
 	int version,
@@ -574,6 +576,11 @@ int cms_set_key_agreement_info(
 	const uint8_t *user_cert, size_t user_cert_len,
 	const uint8_t *user_id, size_t user_id_len);
 
+#define PEM_CMS "CMS"
+int cms_to_pem(const uint8_t *cms, size_t cms_len, FILE *fp);
+int cms_from_pem(uint8_t *cms, size_t *cms_len, size_t maxlen, FILE *fp);
+
+
 int cms_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *a, size_t alen);
 
 

include/gmssl/digest.h

@@ -75,7 +75,7 @@ typedef struct DIGEST_CTX DIGEST_CTX;
 struct DIGEST_CTX {
 	union {
 		SM3_CTX sm3_ctx;
-		MD5_CTX md5_ctx;
+//		MD5_CTX md5_ctx;
 		SHA1_CTX sha1_ctx;
 		SHA224_CTX sha224_ctx;
 		SHA256_CTX sha256_ctx;
@@ -96,7 +96,7 @@ struct DIGEST {
 };
 
 const DIGEST *DIGEST_sm3(void);
-const DIGEST *DIGEST_md5(void);
+//const DIGEST *DIGEST_md5(void);
 const DIGEST *DIGEST_sha1(void);
 const DIGEST *DIGEST_sha224(void);
 const DIGEST *DIGEST_sha256(void);

include/gmssl/oid.h

@@ -103,6 +103,7 @@ enum {
 	OID_at_serial_number,
 	OID_at_pseudonym,
 	OID_domain_component,
+	OID_email_address,
 
 	// Cert Extensions
 	OID_ce_authority_key_identifier,
@@ -120,6 +121,7 @@ enum {
 	OID_ce_crl_distribution_points,
 	OID_ce_inhibit_any_policy,
 	OID_ce_freshest_crl,
+	OID_netscape_cert_type,
 	OID_netscape_cert_comment,
 	OID_cert_authority_info_access,
 	OID_ct_precertificate_scts,

include/gmssl/sm2.h

@@ -336,6 +336,7 @@ typedef struct {
 	uint8_t s[32];
 } SM2_SIGNATURE;
 
+int sm2_do_sign_ex(const SM2_KEY *key, int flags, const uint8_t dgst[32], SM2_SIGNATURE *sig);
 int sm2_do_sign(const SM2_KEY *key, const uint8_t dgst[32], SM2_SIGNATURE *sig);
 int sm2_do_verify(const SM2_KEY *key, const uint8_t dgst[32], const SM2_SIGNATURE *sig);
 
@@ -344,6 +345,7 @@ int sm2_do_verify(const SM2_KEY *key, const uint8_t dgst[32], const SM2_SIGNATUR
 int sm2_signature_to_der(const SM2_SIGNATURE *sig, uint8_t **out, size_t *outlen);
 int sm2_signature_from_der(SM2_SIGNATURE *sig, const uint8_t **in, size_t *inlen);
 int sm2_signature_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *sig, size_t siglen);
+int sm2_sign_ex(const SM2_KEY *key, int flags, const uint8_t dgst[32], uint8_t *sig, size_t *siglen);
 int sm2_sign(const SM2_KEY *key, const uint8_t dgst[32], uint8_t *sig, size_t *siglen);
 int sm2_verify(const SM2_KEY *key, const uint8_t dgst[32], const uint8_t *sig, size_t siglen);
 
@@ -387,6 +389,7 @@ typedef struct {
 	uint8_t ciphertext[SM2_MAX_PLAINTEXT_SIZE];
 } SM2_CIPHERTEXT;
 
+int sm2_do_encrypt_ex(const SM2_KEY *key, int flags, const uint8_t *in, size_t inlen, SM2_CIPHERTEXT *out);
 int sm2_do_encrypt(const SM2_KEY *key, const uint8_t *in, size_t inlen, SM2_CIPHERTEXT *out);
 int sm2_do_decrypt(const SM2_KEY *key, const SM2_CIPHERTEXT *in, uint8_t *out, size_t *outlen);
 
@@ -395,6 +398,7 @@ int sm2_do_decrypt(const SM2_KEY *key, const SM2_CIPHERTEXT *in, uint8_t *out, s
 int sm2_ciphertext_to_der(const SM2_CIPHERTEXT *c, uint8_t **out, size_t *outlen);
 int sm2_ciphertext_from_der(SM2_CIPHERTEXT *c, const uint8_t **in, size_t *inlen);
 int sm2_ciphertext_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *a, size_t alen);
+int sm2_encrypt_ex(const SM2_KEY *key, int flags, const uint8_t *in, size_t inlen, uint8_t *out, size_t *outlen);
 int sm2_encrypt(const SM2_KEY *key, const uint8_t *in, size_t inlen, uint8_t *out, size_t *outlen);
 int sm2_decrypt(const SM2_KEY *key, const uint8_t *in, size_t inlen, uint8_t *out, size_t *outlen);
 

include/gmssl/x509.h

@@ -76,7 +76,6 @@ X509 Public API
 	x509_name_to_der
 	x509_name_from_der
 	x509_name_print
-	x509_name_get_printable
 	x509_name_get_value_by_type
 	x509_name_get_common_name
 
@@ -171,6 +170,16 @@ int x509_rdn_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t
 
 /*
 Name ::= SEQUENCE OF RelativeDistinguishedName
+
+Example:
+    SEQUENCE LEN
+      SET LEN
+          SEQUENCE LEN OID=countryName, String=CN
+      SET LEN
+          SEQUENCE LEN OID=stateName, String=CN
+          SEQUENCE LEN OID=unknown, String=ABC
+      SET LEN
+          SEQUENCE LEN OID=commonNmame, String=ABC
 */
 int x509_name_add_rdn(uint8_t *d, size_t *dlen, size_t maxlen, int oid, int tag, const uint8_t *val, size_t vlen, const uint8_t *more, size_t mlen);
 int x509_name_add_country_name(uint8_t *d, size_t *dlen, int maxlen, const char val[2] ); // val: PrintableString SIZE(2)
@@ -188,7 +197,6 @@ int x509_name_set(uint8_t *d, size_t *dlen, size_t maxlen,
 #define x509_name_to_der(d,dlen,out,outlen) asn1_sequence_to_der(d,dlen,out,outlen)
 #define x509_name_from_der(d,dlen,in,inlen) asn1_sequence_from_der(d,dlen,in,inlen)
 int x509_name_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *d, size_t dlen);
-int x509_name_get_printable(const uint8_t *d, size_t dlen, char *str, size_t maxlen);
 int x509_name_get_value_by_type(const uint8_t *d, size_t dlen, int oid, int *tag, const uint8_t **val, size_t *vlen);
 int x509_name_get_common_name(const uint8_t *d, size_t dlen, int *tag, const uint8_t **val, size_t *vlen);
 
@@ -348,7 +356,7 @@ int x509_cert_get_subject(const uint8_t *a, size_t alen, const uint8_t **subj, s
 int x509_cert_get_subject_public_key(const uint8_t *a, size_t alen, SM2_KEY *public_key);
 
 int x509_certs_to_pem(const uint8_t *d, size_t dlen, FILE *fp);
-int x509_certs_from_pem(const uint8_t *d, size_t *dlen, size_t maxlen, FILE *fp);
+int x509_certs_from_pem(uint8_t *d, size_t *dlen, size_t maxlen, FILE *fp);
 int x509_certs_get_count(const uint8_t *d, size_t dlen, size_t *cnt);
 int x509_certs_get_cert_by_index(const uint8_t *d, size_t dlen, int index, const uint8_t **cert, size_t *certlen);
 int x509_certs_get_cert_by_subject(const uint8_t *d, size_t dlen, const uint8_t *subject, size_t subject_len, const uint8_t **cert, size_t *certlen);

include/gmssl/x509_alg.h

@@ -80,6 +80,7 @@ int x509_encryption_algor_from_der(int *oid, const uint8_t **iv, size_t *ivlen,
 int x509_encryption_algor_to_der(int oid, const uint8_t *iv, size_t ivlen, uint8_t **out, size_t *outlen);
 int x509_encryption_algor_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *d, size_t dlen);
 
+#define X509_ALGOR_ALLOW_EC_NULL_PARAM 1
 const char *x509_signature_algor_name(int oid);
 int x509_signature_algor_from_name(const char *name);
 int x509_signature_algor_from_der(int *oid, const uint8_t **in, size_t *inlen);

include/gmssl/x509_crl.h

@@ -268,6 +268,10 @@ int x509_crl_to_der(const uint8_t *a, size_t alen, uint8_t **out, size_t *outlen
 int x509_crl_from_der(const uint8_t **a, size_t *alen, const uint8_t **in, size_t *inlen);
 int x509_crl_to_pem(const uint8_t *a, size_t alen, FILE *fp);
 int x509_crl_from_pem(uint8_t *a, size_t *alen, size_t maxlen, FILE *fp);
+int x509_crl_to_fp(const uint8_t *a, size_t alen, FILE *fp);
+int x509_crl_from_fp(uint8_t *a, size_t *alen, size_t maxlen, FILE *fp);
+
+
 int x509_crl_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *a, size_t alen);
 
 int x509_crl_sign(uint8_t *crl, size_t *crl_len,

include/gmssl/x509_ext.h

@@ -554,6 +554,24 @@ FreshestCRL ::= CRLDistributionPoints
 #define x509_freshest_crl_from_der(d,dlen,in,inlen) x509_crl_distribution_points_from_der(d,dlen,in,inlen)
 #define x509_freshest_crl_print(fp,fmt,ind,label,d,dlen) x509_crl_distribution_points_print(fp,fmt,ind,label,d,dlen)
 
+/*
+Netscape-Defined Certificate Extensions
+https://docs.oracle.com/cd/E19957-01/816-5533-10/ext.htm#1023061
+
+NetscapeCertType ::= BIT STRING
+
+	bit 0: SSL Client certificate
+	bit 1: SSL Server certificate
+	bit 2: S/MIME certificate
+	bit 3: Object-signing certificate
+	bit 4: Reserved for future use
+	bit 5: SSL CA certificate
+	bit 6: S/MIME CA certificate
+	bit 7: Object-signing CA certificate
+
+NetscapeCertComment ::= IA5String
+*/
+int x509_netscape_cert_type_print(FILE *fp, int fmt, int ind, const char *label, int bits);
 
 #ifdef __cplusplus
 }