Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Side by Side Diff: nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* 4 /*
5 * pkix_pl_socket.c 5 * pkix_pl_socket.c
6 * 6 *
7 * Socket Function Definitions 7 * Socket Function Definitions
8 * 8 *
9 */ 9 */
10 10
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 entry.hashcodeFunction = pkix_pl_Socket_Hashcode; 758 entry.hashcodeFunction = pkix_pl_Socket_Hashcode;
759 entry.toStringFunction = NULL; 759 entry.toStringFunction = NULL;
760 entry.comparator = NULL; 760 entry.comparator = NULL;
761 entry.duplicateFunction = NULL; 761 entry.duplicateFunction = NULL;
762 762
763 systemClasses[PKIX_SOCKET_TYPE] = entry; 763 systemClasses[PKIX_SOCKET_TYPE] = entry;
764 764
765 #ifdef PKIX_SOCKETTRACE 765 #ifdef PKIX_SOCKETTRACE
766 { 766 {
767 char *val = NULL; 767 char *val = NULL;
768 val = PR_GetEnv("SOCKETTRACE"); 768 val = PR_GetEnvSecure("SOCKETTRACE");
769 /* Is SOCKETTRACE set in the environment? */ 769 /* Is SOCKETTRACE set in the environment? */
770 if ((val != NULL) && (*val != '\0')) { 770 if ((val != NULL) && (*val != '\0')) {
771 socketTraceFlag = 771 socketTraceFlag =
772 ((*val == '1')?PKIX_TRUE:PKIX_FALSE); 772 ((*val == '1')?PKIX_TRUE:PKIX_FALSE);
773 } 773 }
774 } 774 }
775 #endif 775 #endif
776 776
777 PKIX_RETURN(SOCKET); 777 PKIX_RETURN(SOCKET);
778 } 778 }
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 PRFileDesc **pDesc, 1686 PRFileDesc **pDesc,
1687 void *plContext) 1687 void *plContext)
1688 { 1688 {
1689 PKIX_ENTER(SOCKET, "pkix_pl_Socket_GetPRFileDesc"); 1689 PKIX_ENTER(SOCKET, "pkix_pl_Socket_GetPRFileDesc");
1690 PKIX_NULLCHECK_TWO(socket, pDesc); 1690 PKIX_NULLCHECK_TWO(socket, pDesc);
1691 1691
1692 *pDesc = socket->clientSock; 1692 *pDesc = socket->clientSock;
1693 1693
1694 PKIX_RETURN(SOCKET); 1694 PKIX_RETURN(SOCKET);
1695 } 1695 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698