Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_ssl / lib / sslUtils.h

diff --git a/libsecurity_ssl/lib/sslUtils.h b/libsecurity_ssl/lib/sslUtils.h
index e31763b08c7f5d270423e33417a70fbf79009b90..40501aa6659f08eff5bf317a4046f1a8b146cdf7 100644 (file)
--- a/libsecurity_ssl/lib/sslUtils.h
+++ b/libsecurity_ssl/lib/sslUtils.h
@@ -22,14 +22,13 @@
  */
 
 /*
  */
 
 /*

- * sslUtils.h
+ * sslUtils.h - - Misc. OS independant SSL utility functions

  */
 
 #ifndef _SSLUTILS_H_
 #define _SSLUTILS_H_ 1
 
  */
 
 #ifndef _SSLUTILS_H_
 #define _SSLUTILS_H_ 1
 

-#include "SecureTransport.h"
-#include "sslPriv.h"
+#include "sslTypes.h"

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -40,7 +39,7 @@ uint32_t SSLDecodeInt(
        size_t              length);
 uint8_t *SSLEncodeInt(
        uint8_t             *p,
        size_t              length);
 uint8_t *SSLEncodeInt(
        uint8_t             *p,

-       uint32_t            value,
+       size_t              value,

        size_t length);
 
 /* Same, but the value to encode is a size_t */
        size_t length);
 
 /* Same, but the value to encode is a size_t */


@@ -58,12 +57,10 @@ uint8_t* SSLEncodeUInt64(
        sslUint64           value);
 void IncrementUInt64(
        sslUint64                       *v);
        sslUint64           value);
 void IncrementUInt64(
        sslUint64                       *v);

-#if ENABLE_DTLS

 void SSLDecodeUInt64(
     const uint8_t *p,
     size_t length,
     sslUint64 *v);
 void SSLDecodeUInt64(
     const uint8_t *p,
     size_t length,
     sslUint64 *v);

-#endif

 
 static inline
 int SSLHandshakeHeaderSize(SSLRecord *rec)
 
 static inline
 int SSLHandshakeHeaderSize(SSLRecord *rec)


@@ -74,68 +71,10 @@ int SSLHandshakeHeaderSize(SSLRecord *rec)
         return 4;
 }
 
         return 4;
 }
 

-uint8_t *SSLEncodeHandshakeHeader(
-    SSLContext *ctx,
-    SSLRecord *rec,
-    SSLHandshakeType type,
-    size_t msglen);
-
-#ifdef USE_SSLCERTIFICATE
-size_t SSLGetCertificateChainLength(
-       const SSLCertificate *c);
-OSStatus sslDeleteCertificateChain(
-       SSLCertificate          *certs,
-       SSLContext                      *ctx);
-#endif /* USE_SSLCERTIFICATE */
-
-Boolean sslIsSessionActive(
-       const SSLContext        *ctx);
-
-OSStatus sslTime(
-       uint32_t            *tim);
-
-#if    SSL_DEBUG
-extern const char *protocolVersStr(
-       SSLProtocolVersion      prot);
+#ifndef NDEBUG
+extern const char *protocolVersStr(SSLProtocolVersion prot);

 #endif
 #endif

-
-/*
- * Redirect SSLBuffer-based I/O call to user-supplied I/O.
- */
-OSStatus sslIoRead(
-       SSLBuffer               buf,
-       size_t                  *actualLength,
-       SSLContext              *ctx);
-
-OSStatus sslIoWrite(
-       SSLBuffer               buf,
-       size_t                  *actualLength,
-       SSLContext              *ctx);
-
-/*
- * Common RNG function.
- */
-OSStatus sslRand(
-       SSLContext              *ctx,
-       SSLBuffer               *buf);
-
-OSStatus sslVerifyProtVersion(
-       SSLContext                      *ctx,
-       SSLProtocolVersion      peerVersion,
-       SSLProtocolVersion      *negVersion);
-
-OSStatus sslGetMaxProtVersion(
-       SSLContext                      *ctx,
-       SSLProtocolVersion      *version);      // RETURNED
-
-static inline bool sslVersionIsLikeTls12(SSLContext *ctx)
-{
-    assert(ctx->negProtocolVersion!=SSL_Version_Undetermined);
-    return ctx->isDTLS ? ctx->negProtocolVersion > DTLS_Version_1_0 : ctx->negProtocolVersion >= TLS_Version_1_2;
-}
-
-#define SET_SSL_BUFFER(buf, d, l)   do { (buf).data = (d); (buf).length = (l); } while (0)
-
+ 

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif