X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/b1ab9ed8d0e0f1c3b66d7daa8fd5564444c56195..e3d3b979fd185d8303f28a937baa53a187fb8c7d:/libsecurity_ssl/lib/tls_ssl.h

diff --git a/libsecurity_ssl/lib/tls_ssl.h b/libsecurity_ssl/lib/tls_ssl.h
index 5a682d52..aa6f8aae 100644
--- a/libsecurity_ssl/lib/tls_ssl.h
+++ b/libsecurity_ssl/lib/tls_ssl.h
@@ -22,8 +22,8 @@
  */
 
 /*
- * tls_ssl.h - Declarations of callout struct to provide indirect calls to
- *     SSLv3 and TLS routines.
+ * tls_ssl.h - Declarations of handshake layer callout struct to provide indirect calls to
+ *     SSLv3 and TLS routines. 
  */
 
 #ifndef	_TLS_SSL_H_
@@ -37,42 +37,11 @@ extern "C" {
 #include "sslPriv.h"
 #include "sslContext.h"
 #include "sslRecord.h"
-#include "cryptType.h"
 
 /***
  *** Each of {TLS, SSLv3} implements each of these functions.
  ***/
 
-/* unpack, decrypt, validate one record */
-typedef OSStatus (*decryptRecordFcn) (
-	UInt8 type,
-	SSLBuffer *payload,
-	SSLContext *ctx);
-
-/* pack, encrypt, mac, queue one outgoing record */
-typedef OSStatus (*writeRecordFcn) (
-	SSLRecord rec,
-	SSLContext *ctx);
-
-/* initialize a per-CipherContext HashHmacContext for use in MACing each record */
-typedef OSStatus (*initMacFcn) (
-	CipherContext *cipherCtx,		// macRef, macSecret valid on entry
-									// macCtx valid on return
-	SSLContext *ctx);
-
-/* free per-CipherContext HashHmacContext */
-typedef OSStatus (*freeMacFcn) (
-	CipherContext *cipherCtx);
-
-/* compute MAC on one record */
-typedef OSStatus (*computeMacFcn) (
-	UInt8 type,
-	SSLBuffer data,
-	SSLBuffer mac, 					// caller mallocs data
-	CipherContext *cipherCtx,		// assumes macCtx, macRef
-	sslUint64 seqNo,
-	SSLContext *ctx);
-
 typedef OSStatus (*generateKeyMaterialFcn) (
 	SSLBuffer key, 					// caller mallocs and specifies length of
 									//   required key material here
@@ -104,29 +73,20 @@ typedef OSStatus (*computeCertVfyMacFcn) (
     SSLBuffer *finished,		// output - mallocd by caller
     SSL_HashAlgorithm hash);    //only used in TLS 1.2
 
+
 typedef struct _SslTlsCallouts {
-	decryptRecordFcn			decryptRecord;
-	writeRecordFcn				writeRecord;
-	initMacFcn					initMac;
-	freeMacFcn					freeMac;
-	computeMacFcn				computeMac;
 	generateKeyMaterialFcn		generateKeyMaterial;
-	generateExportKeyAndIvFcn	generateExportKeyAndIv;
 	generateMasterSecretFcn		generateMasterSecret;
 	computeFinishedMacFcn		computeFinishedMac;
 	computeCertVfyMacFcn		computeCertVfyMac;
 } SslTlsCallouts;
 
+
 /* From ssl3Callouts.c and tls1Callouts.c */
 extern const SslTlsCallouts	Ssl3Callouts;
 extern const SslTlsCallouts	Tls1Callouts;
 extern const SslTlsCallouts Tls12Callouts;
 
-/* one callout routine used in common (for now) */
-OSStatus ssl3WriteRecord(
-	SSLRecord rec,
-	SSLContext *ctx);
-
 #ifdef	__cplusplus
 }
 #endif