X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/866f8763175ff60e4fa455b92b5eb660a12fe6c7..bf028f67fd3bb2266df81b80fb6f25a77112e308:/sslViewer/sslServer.cpp?ds=sidebyside diff --git a/sslViewer/sslServer.cpp b/sslViewer/sslServer.cpp index 699fb4b7..fefc0898 100644 --- a/sslViewer/sslServer.cpp +++ b/sslViewer/sslServer.cpp @@ -45,10 +45,10 @@ #include #include -#include "SecurityTool/print_cert.h" +#include "SecurityTool/sharedTool/print_cert.h" #if NO_SERVER -#include +#include "keychain/securityd/spi.h" #endif /* Set true when PR-3074739 is merged to TOT */ @@ -259,7 +259,9 @@ static OSStatus sslServe( size_t length; uint8_t rcvBuf[RCV_BUF_SIZE]; const char *outMsg = SERVER_MESSAGE; - + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" *negVersion = kSSLProtocolUnknown; *negCipher = SSL_NULL_WITH_NULL_NULL; *peerCerts = NULL; @@ -287,7 +289,7 @@ static OSStatus sslServe( if(ortn) { printSslErrStr("SSLNewContext", ortn); goto cleanup; - } + } ortn = SSLSetIOFuncs(ctx, SocketRead, SocketWrite); if(ortn) { printSslErrStr("SSLSetIOFuncs", ortn); @@ -549,7 +551,10 @@ cleanup: } if(ctx) { SSLDisposeContext(ctx); - } + } + +#pragma clang diagnostic pop + /* FIXME - dispose of serverCerts */ return ortn; } @@ -625,10 +630,15 @@ static void showSSLResult( sslGetProtocolVersionString(negVersion)); printf(" Negotiated CipherSuite : %s\n", sslGetCipherSuiteString(negCipher)); + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" if(certState != kSSLClientCertNone) { printf(" Client Cert State : %s\n", sslGetClientCertStateString(certState)); } +#pragma clang diagnostic pop + printf(" Resumed Session : "); if(sessionWasResumed) { for(unsigned dex=0; dex loop forever */ @@ -918,27 +900,7 @@ int main(int argc, char **argv) if(serverCerts == nil) { exit(1); } - } - else -#if 0 - if(doIdSearch) { - OSStatus ortn = sslIdentityPicker(NULL, anchorFile, true, NULL, &serverCerts); - if(ortn) { - printf("***IdentitySearch failure; aborting.\n"); - exit(1); - } - } - if(password) { - OSStatus ortn = SecKeychainUnlock(serverKc, strlen(password), password, true); - if(ortn) { - printf("SecKeychainUnlock returned %d\n", (int)ortn); - /* oh well */ - } - } -#else - (void) doIdSearch; -#endif - if(protXOnly) { + } else if(protXOnly) { switch(attemptProt) { case kTLSProtocol1: attemptProt = kTLSProtocol1Only; @@ -950,17 +912,8 @@ int main(int argc, char **argv) break; } } -#if 0 - if(dhParamsFile) { - int r = cspReadFile(dhParamsFile, &dhParams, &dhParamsLen); - if(r) { - printf("***Error reading diffie-hellman params from %s; aborting\n", - dhParamsFile); - } - } -#else - (void) dhParamsFile; -#endif + +#pragma clang diagnostic pop /* one-time only server port setup */ err = ListenForClients(portNum, nonBlocking, &listenSock);