Removes {i2o,o2i}_SCT_signature from the CT public API

They may return if an SCT_signature struct is added in the future that
allows them to be refactored to conform to the i2d/d2i function signature
conventions.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>

diff --git a/crypto/ct/ct_locl.h b/crypto/ct/ct_locl.h
index 6b2fa3ef0c818257e350575ae133ca04f2500e4d..b65df5a57d8ad552052d107662eb47589ff08ee5 100644 (file)
--- a/crypto/ct/ct_locl.h
+++ b/crypto/ct/ct_locl.h
@@ -171,6 +171,29 @@ __owur int SCT_is_complete(const SCT *sct);
  */
 __owur int SCT_signature_is_complete(const SCT *sct);
 
  */
 __owur int SCT_signature_is_complete(const SCT *sct);
 

+/*
+ * TODO(RJPercival): Create an SCT_signature struct and make i2o_SCT_signature
+ * and o2i_SCT_signature conform to the i2d/d2i conventions.
+ */
+
+/*
+* Serialize (to TLS format) an |sct| signature and write it to |out|.
+* If |out| is null, no signature will be output but the length will be returned.
+* If |out| points to a null pointer, a string will be allocated to hold the
+* TLS-format signature. It is the responsibility of the caller to free it.
+* If |out| points to an allocated string, the signature will be written to it.
+* The length of the signature in TLS format will be returned.
+*/
+__owur int i2o_SCT_signature(const SCT *sct, unsigned char **out);
+
+/*
+* Parses an SCT signature in TLS format and populates the |sct| with it.
+* |in| should be a pointer to a string containing the TLS-format signature.
+* |in| will be advanced to the end of the signature if parsing succeeds.
+* |len| should be the length of the signature in |in|.
+* Returns the number of bytes parsed, or a negative integer if an error occurs.
+*/
+__owur int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len);

 
 /*
  * Handlers for Certificate Transparency X509v3/OCSP extensions
 
 /*
  * Handlers for Certificate Transparency X509v3/OCSP extensions

diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index a0314f01e44dd4209f234b97732b75a4f744dc77..70a058695d0aa36ff8d19039d7242c692740e80e 100644 (file)
--- a/include/openssl/ct.h
+++ b/include/openssl/ct.h
@@ -378,25 +378,6 @@ __owur int i2o_SCT(const SCT *sct, unsigned char **out);
  */
 SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len);
 
  */
 SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len);
 

-/*
-* Serialize (to TLS format) an |sct| signature and write it to |out|.
-* If |out| is null, no signature will be output but the length will be returned.
-* If |out| points to a null pointer, a string will be allocated to hold the
-* TLS-format signature. It is the responsibility of the caller to free it.
-* If |out| points to an allocated string, the signature will be written to it.
-* The length of the signature in TLS format will be returned.
-*/
-__owur int i2o_SCT_signature(const SCT *sct, unsigned char **out);
-
-/*
-* Parses an SCT signature in TLS format and populates the |sct| with it.
-* |in| should be a pointer to a string containing the TLS-format signature.
-* |in| will be advanced to the end of the signature if parsing succeeds.
-* |len| should be the length of the signature in |in|.
-* Returns the number of bytes parsed, or a negative integer if an error occurs.
-*/
-__owur int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len);
-

 /********************
  * CT log functions *
  ********************/
 /********************
  * CT log functions *
  ********************/

diff --git a/util/libcrypto.num b/util/libcrypto.num
index e9709f643960e8f45ae4ea3d7d8f36d6c94b9220..c176346cf94ea04f60cb290719209b6192946a9e 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -2536,7 +2536,6 @@ d2i_ECPKParameters                      2501      1_1_0   EXIST::FUNCTION:EC
 IDEA_ofb64_encrypt                      2502   1_1_0   EXIST::FUNCTION:IDEA
 CAST_decrypt                            2503   1_1_0   EXIST::FUNCTION:CAST
 TS_STATUS_INFO_get0_failure_info        2504   1_1_0   EXIST::FUNCTION:TS
 IDEA_ofb64_encrypt                      2502   1_1_0   EXIST::FUNCTION:IDEA
 CAST_decrypt                            2503   1_1_0   EXIST::FUNCTION:CAST
 TS_STATUS_INFO_get0_failure_info        2504   1_1_0   EXIST::FUNCTION:TS

-o2i_SCT_signature                       2505   1_1_0   EXIST::FUNCTION:CT

 ENGINE_unregister_pkey_meths            2506   1_1_0   EXIST::FUNCTION:ENGINE
 DISPLAYTEXT_new                         2507   1_1_0   EXIST::FUNCTION:
 CMS_final                               2508   1_1_0   EXIST::FUNCTION:CMS
 ENGINE_unregister_pkey_meths            2506   1_1_0   EXIST::FUNCTION:ENGINE
 DISPLAYTEXT_new                         2507   1_1_0   EXIST::FUNCTION:
 CMS_final                               2508   1_1_0   EXIST::FUNCTION:CMS


@@ -3588,7 +3587,6 @@ d2i_BASIC_CONSTRAINTS                   3539      1_1_0   EXIST::FUNCTION:
 X509_CERT_AUX_new                       3540   1_1_0   EXIST::FUNCTION:
 ENGINE_register_pkey_asn1_meths         3541   1_1_0   EXIST::FUNCTION:ENGINE
 CRYPTO_ocb128_tag                       3542   1_1_0   EXIST::FUNCTION:OCB
 X509_CERT_AUX_new                       3540   1_1_0   EXIST::FUNCTION:
 ENGINE_register_pkey_asn1_meths         3541   1_1_0   EXIST::FUNCTION:ENGINE
 CRYPTO_ocb128_tag                       3542   1_1_0   EXIST::FUNCTION:OCB

-i2o_SCT_signature                       3543   1_1_0   EXIST::FUNCTION:CT

 ERR_load_OBJ_strings                    3544   1_1_0   EXIST::FUNCTION:
 BIO_ctrl_get_read_request               3545   1_1_0   EXIST::FUNCTION:
 BN_from_montgomery                      3546   1_1_0   EXIST::FUNCTION:
 ERR_load_OBJ_strings                    3544   1_1_0   EXIST::FUNCTION:
 BIO_ctrl_get_read_request               3545   1_1_0   EXIST::FUNCTION:
 BN_from_montgomery                      3546   1_1_0   EXIST::FUNCTION: