s3:libsmb: remove unused functions in clispnego.c

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 518e5e33b20e6e84329611a8fa97fb3a264f9503..8a273c31a3bfb9329a7e9f3423b1471b79c169d1 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -686,13 +686,6 @@ bool wins_server_tag_ips(const char *tag, TALLOC_CTX *mem_ctx,
                         struct in_addr **pservers, int *pnum_servers);
 unsigned wins_srv_count_tag(const char *tag);
 
-/* The following definitions come from libsmb/clispnego.c  */
-
-DATA_BLOB spnego_gen_negTokenInit(TALLOC_CTX *ctx,
-                                 const char *OIDs[],
-                                 DATA_BLOB *psecblob,
-                                 const char *principal);
-
 #ifndef ASN1_MAX_OIDS
 #define ASN1_MAX_OIDS 20
 #endif
@@ -702,18 +695,6 @@ bool spnego_parse_negTokenInit(TALLOC_CTX *ctx,
                               char **principal,
                               DATA_BLOB *secblob);
 DATA_BLOB spnego_gen_krb5_wrap(TALLOC_CTX *ctx, const DATA_BLOB ticket, const uint8_t tok_id[2]);
-int spnego_gen_krb5_negTokenInit(TALLOC_CTX *ctx,
-                           const char *principal, int time_offset,
-                           DATA_BLOB *targ,
-                           DATA_BLOB *session_key_krb5, uint32_t extra_ap_opts,
-                           const char *ccname, time_t *expire_time);
-bool spnego_parse_challenge(TALLOC_CTX *ctx, const DATA_BLOB blob,
-                           DATA_BLOB *chal1, DATA_BLOB *chal2);
-DATA_BLOB spnego_gen_auth(TALLOC_CTX *ctx, DATA_BLOB blob);
-bool spnego_parse_auth_response(TALLOC_CTX *ctx,
-                               DATA_BLOB blob, NTSTATUS nt_status,
-                               const char *mechOID,
-                               DATA_BLOB *auth);
 
 /* The following definitions come from libsmb/conncache.c  */
 

diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index 9aab8fdeba9563121ef469e56a6f0b64512d2931..4a0fbcd73af29934eb4e9fa3607266d2272686d3 100644 (file)
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -25,81 +25,6 @@
 #include "smb_krb5.h"
 #include "../lib/util/asn1.h"
 
-/*
-  generate a negTokenInit packet given a list of supported
-  OIDs (the mechanisms) a blob, and a principal name string
-*/
-
-DATA_BLOB spnego_gen_negTokenInit(TALLOC_CTX *ctx,
-                                 const char *OIDs[],
-                                 DATA_BLOB *psecblob,
-                                 const char *principal)
-{
-       int i;
-       ASN1_DATA *data;
-       DATA_BLOB ret = data_blob_null;
-
-       data = asn1_init(talloc_tos());
-       if (data == NULL) {
-               return data_blob_null;
-       }
-
-       if (!asn1_push_tag(data,ASN1_APPLICATION(0))) goto err;
-       if (!asn1_write_OID(data,OID_SPNEGO)) goto err;
-       if (!asn1_push_tag(data,ASN1_CONTEXT(0))) goto err;
-       if (!asn1_push_tag(data,ASN1_SEQUENCE(0))) goto err;
-
-       if (!asn1_push_tag(data,ASN1_CONTEXT(0))) goto err;
-       if (!asn1_push_tag(data,ASN1_SEQUENCE(0))) goto err;
-       for (i=0; OIDs[i]; i++) {
-               if (!asn1_write_OID(data,OIDs[i])) goto err;
-       }
-       if (!asn1_pop_tag(data)) goto err;
-       if (!asn1_pop_tag(data)) goto err;
-
-       if (psecblob && psecblob->length && psecblob->data) {
-               if (!asn1_push_tag(data, ASN1_CONTEXT(2))) goto err;
-               if (!asn1_write_OctetString(data,psecblob->data,
-                       psecblob->length)) goto err;
-               if (!asn1_pop_tag(data)) goto err;
-       }
-
-       if (principal) {
-               if (!asn1_push_tag(data, ASN1_CONTEXT(3))) goto err;
-               if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) goto err;
-               if (!asn1_push_tag(data, ASN1_CONTEXT(0))) goto err;
-               if (!asn1_write_GeneralString(data,principal)) goto err;
-               if (!asn1_pop_tag(data)) goto err;
-               if (!asn1_pop_tag(data)) goto err;
-               if (!asn1_pop_tag(data)) goto err;
-       }
-
-       if (!asn1_pop_tag(data)) goto err;
-       if (!asn1_pop_tag(data)) goto err;
-
-       if (!asn1_pop_tag(data)) goto err;
-
-       if (!asn1_extract_blob(data, ctx, &ret)) {
-               goto err;
-       }
-
-       asn1_free(data);
-       data = NULL;
-
-  err:
-
-       if (data != NULL) {
-               if (asn1_has_error(data)) {
-                       DEBUG(1, ("Failed to build negTokenInit at offset %d\n",
-                                 (int)asn1_current_ofs(data)));
-               }
-
-               asn1_free(data);
-       }
-
-       return ret;
-}
-
 /*
   parse a negTokenInit packet giving a GUID, a list of supported
   OIDs (the mechanisms) and a principal name string 
@@ -278,210 +203,3 @@ DATA_BLOB spnego_gen_krb5_wrap(TALLOC_CTX *ctx, const DATA_BLOB ticket, const ui
 
        return ret;
 }
-
-/* 
-   generate a SPNEGO krb5 negTokenInit packet, ready for a EXTENDED_SECURITY
-   kerberos session setup
-*/
-int spnego_gen_krb5_negTokenInit(TALLOC_CTX *ctx,
-                           const char *principal, int time_offset,
-                           DATA_BLOB *targ,
-                           DATA_BLOB *session_key_krb5, uint32_t extra_ap_opts,
-                           const char *ccname, time_t *expire_time)
-{
-       int retval;
-       DATA_BLOB tkt, tkt_wrapped;
-       const char *krb_mechs[] = {OID_KERBEROS5_OLD, OID_KERBEROS5, OID_NTLMSSP, NULL};
-
-       /* get a kerberos ticket for the service and extract the session key */
-       retval = cli_krb5_get_ticket(ctx, principal, time_offset,
-                                         &tkt, session_key_krb5,
-                                         extra_ap_opts, ccname,
-                                         expire_time, NULL);
-       if (retval) {
-               return retval;
-       }
-
-       /* wrap that up in a nice GSS-API wrapping */
-       tkt_wrapped = spnego_gen_krb5_wrap(ctx, tkt, TOK_ID_KRB_AP_REQ);
-
-       /* and wrap that in a shiny SPNEGO wrapper */
-       *targ = spnego_gen_negTokenInit(ctx, krb_mechs, &tkt_wrapped, NULL);
-
-       data_blob_free(&tkt_wrapped);
-       data_blob_free(&tkt);
-
-       return retval;
-}
-
-
-/*
-  parse a spnego NTLMSSP challenge packet giving two security blobs
-*/
-bool spnego_parse_challenge(TALLOC_CTX *ctx, const DATA_BLOB blob,
-                           DATA_BLOB *chal1, DATA_BLOB *chal2)
-{
-       bool ret = false;
-       ASN1_DATA *data;
-
-       ZERO_STRUCTP(chal1);
-       ZERO_STRUCTP(chal2);
-
-       data = asn1_init(talloc_tos());
-       if (data == NULL) {
-               return false;
-       }
-
-       if (!asn1_load(data, blob)) goto err;
-       if (!asn1_start_tag(data,ASN1_CONTEXT(1))) goto err;
-       if (!asn1_start_tag(data,ASN1_SEQUENCE(0))) goto err;
-
-       if (!asn1_start_tag(data,ASN1_CONTEXT(0))) goto err;
-       if (!asn1_check_enumerated(data,1)) goto err;
-       if (!asn1_end_tag(data)) goto err;
-
-       if (!asn1_start_tag(data,ASN1_CONTEXT(1))) goto err;
-       if (!asn1_check_OID(data, OID_NTLMSSP)) goto err;
-       if (!asn1_end_tag(data)) goto err;
-
-       if (!asn1_start_tag(data,ASN1_CONTEXT(2))) goto err;
-       if (!asn1_read_OctetString(data, ctx, chal1)) goto err;
-       if (!asn1_end_tag(data)) goto err;
-
-       /* the second challenge is optional (XP doesn't send it) */
-       if (asn1_tag_remaining(data) > 0) {
-               if (!asn1_start_tag(data,ASN1_CONTEXT(3))) goto err;
-               if (!asn1_read_OctetString(data, ctx, chal2)) goto err;
-               if (!asn1_end_tag(data)) goto err;
-       }
-
-       if (!asn1_end_tag(data)) goto err;
-       if (!asn1_end_tag(data)) goto err;
-
-       ret = !asn1_has_error(data);
-
-  err:
-
-       if (asn1_has_error(data)) {
-               data_blob_free(chal1);
-               data_blob_free(chal2);
-       }
-
-       asn1_free(data);
-       return ret;
-}
-
-
-/*
- generate a SPNEGO auth packet. This will contain the encrypted passwords
-*/
-DATA_BLOB spnego_gen_auth(TALLOC_CTX *ctx, DATA_BLOB blob)
-{
-       ASN1_DATA *data;
-       DATA_BLOB ret = data_blob_null;
-
-       data = asn1_init(talloc_tos());
-       if (data == NULL) {
-               return data_blob_null;
-       }
-
-       if (!asn1_push_tag(data, ASN1_CONTEXT(1))) goto err;
-       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) goto err;
-       if (!asn1_push_tag(data, ASN1_CONTEXT(2))) goto err;
-       if (!asn1_write_OctetString(data,blob.data,blob.length)) goto err;
-       if (!asn1_pop_tag(data)) goto err;
-       if (!asn1_pop_tag(data)) goto err;
-       if (!asn1_pop_tag(data)) goto err;
-
-       if (!asn1_extract_blob(data, ctx, &ret)) {
-               goto err;
-       }
-
- err:
-
-       asn1_free(data);
-
-       return ret;
-}
-
-/*
- parse a SPNEGO auth packet. This contains the encrypted passwords
-*/
-bool spnego_parse_auth_response(TALLOC_CTX *ctx,
-                               DATA_BLOB blob, NTSTATUS nt_status,
-                               const char *mechOID,
-                               DATA_BLOB *auth)
-{
-       ASN1_DATA *data;
-       uint8_t negResult;
-       bool ret = false;
-
-       if (NT_STATUS_IS_OK(nt_status)) {
-               negResult = SPNEGO_ACCEPT_COMPLETED;
-       } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               negResult = SPNEGO_ACCEPT_INCOMPLETE;
-       } else {
-               negResult = SPNEGO_REJECT;
-       }
-
-       data = asn1_init(talloc_tos());
-       if (data == NULL) {
-               return false;
-       }
-
-       *auth = data_blob_null;
-
-       if (!asn1_load(data, blob)) goto err;
-       if (!asn1_start_tag(data, ASN1_CONTEXT(1))) goto err;
-       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) goto err;
-       if (!asn1_start_tag(data, ASN1_CONTEXT(0))) goto err;
-       if (!asn1_check_enumerated(data, negResult)) goto err;
-       if (!asn1_end_tag(data)) goto err;
-
-       if (asn1_tag_remaining(data) > 0) {
-               if (!asn1_start_tag(data,ASN1_CONTEXT(1))) goto err;
-               if (!asn1_check_OID(data, mechOID)) goto err;
-               if (!asn1_end_tag(data)) goto err;
-
-               if (asn1_tag_remaining(data) > 0) {
-                       if (!asn1_start_tag(data,ASN1_CONTEXT(2))) goto err;
-                       if (!asn1_read_OctetString(data, ctx, auth)) goto err;
-                       if (!asn1_end_tag(data)) goto err;
-               }
-       } else if (negResult == SPNEGO_ACCEPT_INCOMPLETE) {
-               asn1_set_error(data);
-               goto err;
-       }
-
-       /* Binding against Win2K DC returns a duplicate of the responseToken in
-        * the optional mechListMIC field. This is a bug in Win2K. We ignore
-        * this field if it exists. Win2K8 may return a proper mechListMIC at
-        * which point we need to implement the integrity checking. */
-       if (asn1_tag_remaining(data) > 0) {
-               DATA_BLOB mechList = data_blob_null;
-               if (!asn1_start_tag(data, ASN1_CONTEXT(3))) goto err;
-               if (!asn1_read_OctetString(data, ctx, &mechList)) goto err;
-               data_blob_free(&mechList);
-               if (!asn1_end_tag(data)) goto err;
-               DEBUG(5,("spnego_parse_auth_response received mechListMIC, "
-                   "ignoring.\n"));
-       }
-
-       if (!asn1_end_tag(data)) goto err;
-       if (!asn1_end_tag(data)) goto err;
-
-       ret = !asn1_has_error(data);
-
-  err:
-
-       if (asn1_has_error(data)) {
-               DEBUG(3, ("spnego_parse_auth_response failed at %d\n",
-                         (int)asn1_current_ofs(data)));
-               asn1_free(data);
-               data_blob_free(auth);
-               return false;
-       }
-
-       asn1_free(data);
-       return ret;
-}