Custom extension revision.

[openssl.git] / ssl / ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 173d9b4904a0574ad1e601976e022317644378ae..f779ce66d715dcd8c7e9bcd2dd8524770194130a 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1726,76 +1726,6 @@ void SSL_CTX_set_next_proto_select_cb(SSL_CTX *ctx, int (*cb) (SSL *s, unsigned
        }
 # endif
 
-static int cert_set_custom_cli_ext(CERT *cert, unsigned short ext_type,
-                              custom_cli_ext_first_cb_fn fn1, 
-                              custom_cli_ext_second_cb_fn fn2, void* arg)
-       {
-       size_t i;
-       custom_cli_ext_record* record;
-
-       /* Check for duplicates */
-       for (i=0; i < cert->custom_cli_ext_records_count; i++)
-               if (ext_type == cert->custom_cli_ext_records[i].ext_type)
-                       return 0;
-
-       cert->custom_cli_ext_records = OPENSSL_realloc(cert->custom_cli_ext_records,
-                                                     (cert->custom_cli_ext_records_count + 1) * 
-                                                     sizeof(custom_cli_ext_record));
-       if (!cert->custom_cli_ext_records) {
-               cert->custom_cli_ext_records_count = 0;
-               return 0;
-       }
-       cert->custom_cli_ext_records_count++;
-       record = &cert->custom_cli_ext_records[cert->custom_cli_ext_records_count - 1];
-       record->ext_type = ext_type;
-       record->fn1 = fn1;
-       record->fn2 = fn2;
-       record->arg = arg;
-       return 1;
-       }
-
-static int cert_set_custom_srv_ext(CERT *cert, unsigned short ext_type,
-                              custom_srv_ext_first_cb_fn fn1, 
-                              custom_srv_ext_second_cb_fn fn2, void* arg)
-       {
-       size_t i;
-       custom_srv_ext_record* record;
-
-       /* Check for duplicates */      
-       for (i=0; i < cert->custom_srv_ext_records_count; i++)
-               if (ext_type == cert->custom_srv_ext_records[i].ext_type)
-                       return 0;
-
-       cert->custom_srv_ext_records = OPENSSL_realloc(cert->custom_srv_ext_records,
-                                                     (cert->custom_srv_ext_records_count + 1) * 
-                                                     sizeof(custom_srv_ext_record));
-       if (!cert->custom_srv_ext_records) {
-               cert->custom_srv_ext_records_count = 0;
-               return 0;
-       }
-       cert->custom_srv_ext_records_count++;
-       record = &cert->custom_srv_ext_records[cert->custom_srv_ext_records_count - 1];
-       record->ext_type = ext_type;
-       record->fn1 = fn1;
-       record->fn2 = fn2;
-       record->arg = arg;
-       return 1;
-       }
- 
-int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned short ext_type,
-                              custom_cli_ext_first_cb_fn fn1, 
-                              custom_cli_ext_second_cb_fn fn2, void *arg)
-       {
-       return cert_set_custom_cli_ext(ctx->cert, ext_type, fn1, fn2,arg);
-       }
-
-int SSL_CTX_set_custom_srv_ext(SSL_CTX *ctx, unsigned short ext_type,
-                              custom_srv_ext_first_cb_fn fn1, 
-                              custom_srv_ext_second_cb_fn fn2, void *arg)
-       {
-       return cert_set_custom_srv_ext(ctx->cert, ext_type, fn1, fn2,arg);
-       }
-
 /* SSL_CTX_set_alpn_protos sets the ALPN protocol list on |ctx| to |protos|.
  * |protos| must be in wire-format (i.e. a series of non-empty, 8-bit
  * length-prefixed strings).