diff options
| author | BoringSSL Robot <boringsslrobot@gmail.com> | 2021-10-20 23:54:42 +0000 |
|---|---|---|
| committer | BoringSSL Robot <boringsslrobot@gmail.com> | 2021-10-20 23:54:42 +0000 |
| commit | c76e2b1fd16c20cf5908c33e34d392a276dde806 (patch) | |
| tree | c9e9e44d20cb6f52c6c1a52bf4bdea4770ae174d | |
| parent | b607f579596c3299551c77d60d04b8957d81a05b (diff) | |
| parent | a259a5484237190bf58d57fd80a8b107ad82869f (diff) | |
| download | boringssl-c76e2b1fd16c20cf5908c33e34d392a276dde806.zip boringssl-c76e2b1fd16c20cf5908c33e34d392a276dde806.tar.gz boringssl-c76e2b1fd16c20cf5908c33e34d392a276dde806.tar.bz2 | |
update main-with-bazel from master branch
| -rw-r--r-- | src/crypto/asn1/internal.h | 2 | ||||
| -rw-r--r-- | src/include/openssl/asn1.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/crypto/asn1/internal.h b/src/crypto/asn1/internal.h index 5731499..4190e61 100644 --- a/src/crypto/asn1/internal.h +++ b/src/crypto/asn1/internal.h @@ -106,6 +106,8 @@ struct asn1_object_st { int flags; /* Should we free this one */ }; +ASN1_OBJECT *ASN1_OBJECT_new(void); + int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d); int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d); diff --git a/src/include/openssl/asn1.h b/src/include/openssl/asn1.h index d376c1a..f49fafb 100644 --- a/src/include/openssl/asn1.h +++ b/src/include/openssl/asn1.h @@ -1618,7 +1618,6 @@ typedef int i2d_of_void(const void *, unsigned char **); #define B_ASN1_DISPLAYTEXT \ B_ASN1_IA5STRING | B_ASN1_VISIBLESTRING | B_ASN1_BMPSTRING | B_ASN1_UTF8STRING -OPENSSL_EXPORT ASN1_OBJECT *ASN1_OBJECT_new(void); OPENSSL_EXPORT void ASN1_OBJECT_free(ASN1_OBJECT *a); OPENSSL_EXPORT int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp); OPENSSL_EXPORT ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, |