utf8 + bom

src/aes.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/aes_modes.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/asn1.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1032,3 +1032,11 @@ int asn1_sequence_of_get_count(const ASN1_SEQUENCE_OF *a, size_t *count)
 	}
 	return 1;
 }
+
+int asn1_check(int expr)
+{
+	if (expr)
+		return 1;
+	error_print();
+	return -1;
+}

src/base64.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use

src/block_cipher.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/chacha20.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/debug.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/des.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/digest.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/endian.h

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/gcm.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/gf128.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/hash_drbg.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/hex.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/hkdf.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/hmac.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/md5.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/mem.h

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/oid.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/pbkdf2.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/pem.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2020 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/pkcs8.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/rand.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/rc4.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sha1.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sha256.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sha512.c

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm2_algo.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm2_asn1.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm2_lib.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm2_prn.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm3.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm3_hmac.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm4_common.c

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm4_enc.c

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm4_lcl.h

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2014 - 2019 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm4_modes.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm4_setkey.c

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2014 - 2019 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm9_keygen.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm9_math.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/sm9_sign.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tlcp.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tls.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tls12.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tls13.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/tls_trace.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/x509_algor.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -156,34 +156,41 @@ int x509_encryption_algor_to_der(int cipher, const uint8_t *iv, size_t ivlen,
 	return 1;
 }
 
-int x509_encryption_algor_from_der(int *cipher,
+const char *x509_encryption_algor_name(int algor)
+{
+	switch (algor) {
+	case OID_sm4_cbc: return "sm4-cbc";
+	}
+	return NULL;
+}
+
+
+int x509_encryption_algor_from_der(int *algor, uint32_t nodes[32], size_t *nodes_count,
 	const uint8_t **iv, size_t *ivlen,
 	const uint8_t **in, size_t *inlen)
 {
 	int ret;
 	const uint8_t *data;
 	size_t datalen;
-	uint32_t nodes[32];
-	size_t nodes_count;
 
 	if ((ret = asn1_sequence_from_der(&data, &datalen, in, inlen)) != 1) {
 		if (ret < 0) error_print();
 		return ret;
 	}
-	if (asn1_object_identifier_from_der(cipher, nodes, &nodes_count, &data, &datalen) != 1
+	if (asn1_object_identifier_from_der(algor, nodes, nodes_count, &data, &datalen) != 1
 		|| asn1_octet_string_from_der(iv, ivlen, &data, &datalen) != 1
 		|| datalen > 0) {
 		error_print();
 		return -1;
 	}
-	if (*cipher == OID_undef) {
-		if (nodes_count == sm4_cbc_nodes_count
+	if (*algor == OID_undef) {
+		if (*nodes_count == sm4_cbc_nodes_count
 			&& memcmp(nodes, sm4_cbc_nodes, sizeof(sm4_cbc_nodes)) == 0) {
-			*cipher = OID_sm4_cbc;
+			*algor = OID_sm4_cbc;
 		} else {
 			size_t i;
 			error_puts("unknown cipher oid :");
-			for (i = 0; i < nodes_count; i++) {
+			for (i = 0; i < *nodes_count; i++) {
 				fprintf(stderr, " %d", nodes[i]);
 			}
 			fprintf(stderr, "\n");
@@ -252,19 +259,18 @@ int x509_signature_algor_to_der(int oid, uint8_t **out, size_t *outlen)
 	return 1;
 }
 
-int x509_signature_algor_from_der(int *oid, const uint8_t **in, size_t *inlen)
+int x509_signature_algor_from_der(int *algor, uint32_t nodes[32], size_t nodes_count,
+	const uint8_t **in, size_t *inlen)
 {
 	int ret;
 	const uint8_t *data;
 	size_t datalen;
-	uint32_t nodes[32];
-	size_t nodes_count;
 	int has_null_obj;
 
 	if ((ret = asn1_sequence_from_der(&data, &datalen, in, inlen)) != 1) {
 		return ret;
 	}
-	if (asn1_object_identifier_from_der(oid, nodes, &nodes_count, &data, &datalen) != 1) {
+	if (asn1_object_identifier_from_der(algor, nodes, &nodes_count, &data, &datalen) != 1) {
 		error_print();
 		return -1;
 	}
@@ -278,7 +284,7 @@ int x509_signature_algor_from_der(int *oid, const uint8_t **in, size_t *inlen)
 		return -1;
 	}
 
-	switch (*oid) {
+	switch (*algor) {
 	//case OID_ecdsa_with_sha1:
 	//case OID_ecdsa_with_sha224
 	//case OID_ecdsa_with_sha256:
@@ -327,7 +333,7 @@ int x509_public_key_encryption_algor_to_der(int algor, uint8_t **out, size_t *ou
 }
 
 int x509_public_key_encryption_algor_from_der(int *algor, uint32_t *nodes, size_t *nodes_count,
-	const uint8_t *params, size_t *params_len,
+	const uint8_t **params, size_t *params_len,
 	const uint8_t **in, size_t *inlen)
 {
 	int ret;
@@ -345,17 +351,3 @@ int x509_public_key_encryption_algor_from_der(int *algor, uint32_t *nodes, size_
 	// FIXME: 我们需要一个读取完整obj的函数
 	return 1;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-

src/x509_asn1.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -998,6 +998,8 @@ int x509_tbs_certificate_from_der(X509_TBS_CERTIFICATE *a, const uint8_t **in, s
 	const uint8_t *serial_number;
 	const uint8_t *issuer_unique_id = NULL;
 	const uint8_t *subject_unique_id = NULL;
+	uint32_t nodes[32];
+	size_t nodes_count;
 
 	if ((ret = asn1_sequence_from_der(&data, &datalen, in, inlen)) != 1) {
 		if (ret < 0) error_print();
@@ -1005,7 +1007,7 @@ int x509_tbs_certificate_from_der(X509_TBS_CERTIFICATE *a, const uint8_t **in, s
 	}
 	if (x509_version_from_der(&a->version, &data, &datalen) != 1
 		|| asn1_integer_from_der(&serial_number, &a->serial_number_len, &data, &datalen) != 1
-		|| x509_signature_algor_from_der(&a->signature_algor, &data, &datalen) != 1
+		|| x509_signature_algor_from_der(&a->signature_algor, nodes, &nodes_count, &data, &datalen) != 1
 		|| x509_name_from_der(&a->issuer, &data, &datalen) != 1
 		|| x509_validity_from_der(&a->validity, &data, &datalen) != 1
 		|| x509_name_from_der(&a->subject, &data, &datalen) != 1
@@ -1077,6 +1079,8 @@ int x509_certificate_from_der(X509_CERTIFICATE *a, const uint8_t **in, size_t *i
 	size_t datalen;
 	const uint8_t *sig;
 	size_t sig_nbits;
+	uint32_t nodes[32];
+	size_t nodes_count;
 
 	if ((ret = asn1_sequence_from_der(&data, &datalen, in, inlen)) != 1) {
 		if (ret < 0) error_print();
@@ -1084,7 +1088,7 @@ int x509_certificate_from_der(X509_CERTIFICATE *a, const uint8_t **in, size_t *i
 	}
 	memset(a, 0, sizeof(X509_CERTIFICATE));
 	if (x509_tbs_certificate_from_der(&a->tbs_certificate, &data, &datalen) != 1
-		|| x509_signature_algor_from_der(&a->signature_algor, &data, &datalen) != 1
+		|| x509_signature_algor_from_der(&a->signature_algor, nodes, &nodes_count, &data, &datalen) != 1
 		|| asn1_bit_string_from_der(&sig, &sig_nbits, &data, &datalen) != 1
 		|| datalen > 0) {
 		error_print();
@@ -1263,13 +1267,15 @@ int x509_cert_request_from_der(X509_CERT_REQUEST *a, const uint8_t **in, size_t
 	size_t datalen;
 	const uint8_t *sig;
 	size_t siglen;
+	uint32_t nodes[32];
+	size_t nodes_count;
 
 	if ((ret = asn1_sequence_from_der(&data, &datalen, in, inlen)) != 1) {
 		if (ret < 0) error_print();
 		return ret;
 	}
 	if (x509_cert_request_info_from_der(&a->req_info, &data, &datalen) != 1
-		|| x509_signature_algor_from_der(&a->signature_algor, &data, &datalen) != 1
+		|| x509_signature_algor_from_der(&a->signature_algor, nodes, &nodes_count, &data, &datalen) != 1
 		|| x509_signature_copy_from_der(128, a->signature, &a->signature_len, &data, &datalen) != 1
 		|| datalen > 0) {
 		error_print();

src/x509_crl.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2021 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/x509_ext.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/x509_lib.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2014 - 2020 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/zuc_core.c

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2015 - 2021 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/zuc_eea.c

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2015 - 2019 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

src/zuc_eia.c

@@ -1,4 +1,4 @@
-/* ====================================================================
+/* ====================================================================
  * Copyright (c) 2015 - 2019 The GmSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without