Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_ssl / lib / sslHandshakeFinish.c

diff --git a/libsecurity_ssl/lib/sslHandshakeFinish.c b/libsecurity_ssl/lib/sslHandshakeFinish.c
index a1c82066a601090e9777910298133ccaaef45d95..5a3f3a2fc8f8009f10c8c6c2ed3784db5c9394de 100644 (file)
--- a/libsecurity_ssl/lib/sslHandshakeFinish.c
+++ b/libsecurity_ssl/lib/sslHandshakeFinish.c
@@ -64,8 +64,7 @@ SSLEncodeFinishedMessage(SSLRecord *finished, SSLContext *ctx)
     finished->contentType = SSL_RecordTypeHandshake;
        /* msg = type + 3 bytes len + finishedSize */
     head = SSLHandshakeHeaderSize(finished);
     finished->contentType = SSL_RecordTypeHandshake;
        /* msg = type + 3 bytes len + finishedSize */
     head = SSLHandshakeHeaderSize(finished);

-    if ((err = SSLAllocBuffer(&finished->contents, finishedSize + head,
-                       ctx)) != 0)
+    if ((err = SSLAllocBuffer(&finished->contents, finishedSize + head)) != 0)

         return err;
 
     p = SSLEncodeHandshakeHeader(ctx, finished, SSL_HdskFinished, finishedSize);
         return err;
 
     p = SSLEncodeHandshakeHeader(ctx, finished, SSL_HdskFinished, finishedSize);


@@ -80,7 +79,7 @@ SSLEncodeFinishedMessage(SSLRecord *finished, SSLContext *ctx)
         return err;
 
     /* Keep this around for secure renegotiation */
         return err;
 
     /* Keep this around for secure renegotiation */

-    SSLFreeBuffer(&ctx->ownVerifyData, ctx);
+    SSLFreeBuffer(&ctx->ownVerifyData);

     return SSLCopyBuffer(&finishedMsg, &ctx->ownVerifyData);
 }
 
     return SSLCopyBuffer(&finishedMsg, &ctx->ownVerifyData);
 }
 


@@ -110,7 +109,7 @@ SSLProcessFinished(SSLBuffer message, SSLContext *ctx)
         return errSSLProtocol;
     }
     expectedFinished.data = 0;
         return errSSLProtocol;
     }
     expectedFinished.data = 0;

-    if ((err = SSLAllocBuffer(&expectedFinished, finishedSize, ctx)) != 0)
+    if ((err = SSLAllocBuffer(&expectedFinished, finishedSize)))

         return err;
     isServerMsg = (ctx->protocolSide == kSSLServerSide) ? false : true;
     if ((err = ctx->sslTslCalls->computeFinishedMac(ctx, expectedFinished, isServerMsg)) != 0)
         return err;
     isServerMsg = (ctx->protocolSide == kSSLServerSide) ? false : true;
     if ((err = ctx->sslTslCalls->computeFinishedMac(ctx, expectedFinished, isServerMsg)) != 0)


@@ -124,11 +123,11 @@ SSLProcessFinished(SSLBuffer message, SSLContext *ctx)
     }
 
     /* Keep this around for secure renegotiation */
     }
 
     /* Keep this around for secure renegotiation */

-    SSLFreeBuffer(&ctx->peerVerifyData, ctx);
+    SSLFreeBuffer(&ctx->peerVerifyData);

     err = SSLCopyBuffer(&expectedFinished, &ctx->peerVerifyData);
 
 fail:
     err = SSLCopyBuffer(&expectedFinished, &ctx->peerVerifyData);
 
 fail:

-    SSLFreeBuffer(&expectedFinished, ctx);
+    SSLFreeBuffer(&expectedFinished);

     return err;
 }
 
     return err;
 }
 


@@ -141,12 +140,12 @@ SSLEncodeServerHelloDone(SSLRecord *helloDone, SSLContext *ctx)
        assert(ctx->negProtocolVersion >= SSL_Version_3_0);
     helloDone->protocolVersion = ctx->negProtocolVersion;
     head = SSLHandshakeHeaderSize(helloDone);
        assert(ctx->negProtocolVersion >= SSL_Version_3_0);
     helloDone->protocolVersion = ctx->negProtocolVersion;
     head = SSLHandshakeHeaderSize(helloDone);

-    if ((err = SSLAllocBuffer(&helloDone->contents, head, ctx)) != 0)
+    if ((err = SSLAllocBuffer(&helloDone->contents, head)))

         return err;
 
     SSLEncodeHandshakeHeader(ctx, helloDone, SSL_HdskServerHelloDone, 0); /* Message has 0 length */
 
         return err;
 
     SSLEncodeHandshakeHeader(ctx, helloDone, SSL_HdskServerHelloDone, 0); /* Message has 0 length */
 

-    return noErr;
+    return errSecSuccess;

 }
 
 OSStatus
 }
 
 OSStatus


@@ -156,5 +155,5 @@ SSLProcessServerHelloDone(SSLBuffer message, SSLContext *ctx)
        sslErrorLog("SSLProcessServerHelloDone: nonzero msg len\n");
         return errSSLProtocol;
     }
        sslErrorLog("SSLProcessServerHelloDone: nonzero msg len\n");
         return errSSLProtocol;
     }

-    return noErr;
+    return errSecSuccess;

 }
 }