Attachment #161128 for bug #203163

View | Details | Raw Unified | Return to bug 203163
Collapse All | Expand All

Lines 3-8 Link Here

(-)b/head/devel/ice/Makefile (-5 / +14 lines)
3		3
4	PORTNAME= Ice	4	PORTNAME= Ice
5	PORTVERSION= 3.6.0	5	PORTVERSION= 3.6.0
		6	PORTREVISION= 1
6	DISTVERSIONPREFIX= v	7	DISTVERSIONPREFIX= v
7	CATEGORIES= devel	8	CATEGORIES= devel
8		9
Lines 102-118 Link Here
102	s\|%%DOCSDIR%%\|${STAGEDIR}${DOCSDIR}\|g; \	103	s\|%%DOCSDIR%%\|${STAGEDIR}${DOCSDIR}\|g; \
103	s\|%%ICONV_LIB%%\|${ICONV_LIB}\|g; \	104	s\|%%ICONV_LIB%%\|${ICONV_LIB}\|g; \
104	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \	105	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
105	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g' \	106	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
		107	s\|%%OPENSSLLIB%%\|${OPENSSLLIB}\|g; \
		108	s\|%%OPENSSLINC%%\|${OPENSSLINC}\|g; \
		109	s\|%%OPENSSLRPATH%%\|${OPENSSLRPATH}\|g;' \
106	${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD	110	${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
107	@${REINPLACE_CMD} 's\|%%BDB_LIB_CXX_NAME%%\|${BDB_LIB_CXX_NAME}\|g; \	111	@${REINPLACE_CMD} 's\|%%BDB_LIB_CXX_NAME%%\|${BDB_LIB_CXX_NAME}\|g; \
108	s\|%%BDB_LIB_DIR%%\|${BDB_LIB_DIR}\|g; \	112	s\|%%BDB_LIB_DIR%%\|${BDB_LIB_DIR}\|g; \
109	s\|%%BDB_INCLUDE_DIR%%\|${BDB_INCLUDE_DIR}\|g; \	113	s\|%%BDB_INCLUDE_DIR%%\|${BDB_INCLUDE_DIR}\|g; \
		114	s\|%%OPENSSLLIB%%\|${OPENSSLLIB}\|g; \
		115	s\|%%OPENSSLINC%%\|${OPENSSLINC}\|g; \
		116	s\|%%OPENSSLRPATH%%\|${OPENSSLRPATH}\|g; \
110	/install_docdir/d' \	117	/install_docdir/d' \
111	${WRKSRC}/cpp/config/Make.rules	118	${WRKSRC}/cpp/config/Make.rules
		119	@${REINPLACE_CMD} 's\|%%OPENSSLBASE%%\|${OPENSSLBASE}\|g;' \
		120	${WRKSRC}/cpp/test/IceSSL/configuration/run.py
112	@${REINPLACE_CMD} '/install_configdir/d' \	121	@${REINPLACE_CMD} '/install_configdir/d' \
113	${WRKSRC}/cpp/config/Make.rules	122	${WRKSRC}/cpp/config/Make.rules
114	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \	123	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \
115	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; ' \	124	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g;' \
116	${WRKSRC}/config/Make.common.rules	125	${WRKSRC}/config/Make.common.rules
117	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \	126	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
118	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \	127	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
Lines 119-130 Link Here
119	s\|%%ICONV_LIB%%\|${ICONV_LIB}\|g; \	128	s\|%%ICONV_LIB%%\|${ICONV_LIB}\|g; \
120	s\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|g; \	129	s\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|g; \
121	s\|%%PYTHON_SITELIBDIR%%\|${STAGEDIR}${PYSITEDIR}\|g; \	130	s\|%%PYTHON_SITELIBDIR%%\|${STAGEDIR}${PYSITEDIR}\|g; \
122	s\|%%PREFIX%%\|${PREFIX}\|g ; \	131	s\|%%PREFIX%%\|${PREFIX}\|g; \
123	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/python/config/Make.rules	132	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/python/config/Make.rules
124	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \	133	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
125	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \	134	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
126	s\|%%PREFIX%%\|${PREFIX}\|g ; \	135	s\|%%PREFIX%%\|${PREFIX}\|g; \
127	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/php/config/Make.rules.php	136	s\|%%LOCALBASE%%\|${LOCALBASE}\|g;' ${WRKSRC}/php/config/Make.rules.php
128		137
129	.if ${PORT_OPTIONS:MTESTS}	138	.if ${PORT_OPTIONS:MTESTS}
130	TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py	139	TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py

Lines 4-10 Link Here

(-)b/head/devel/ice/files/Make.rules.FreeBSD (-1 / +3 lines)
4	LIBS = -lIce $(BASELIBS)	4	LIBS = -lIce $(BASELIBS)
5		5
6	CRYPT_OS_LIBS = -lcrypt	6	CRYPT_OS_LIBS = -lcrypt
7	ICEUTIL_OS_LIBS = -pthread -lcrypto	7	ICEUTIL_OS_LIBS = -pthread $(OPENSSL_RPATH_LINK) -L%%OPENSSLLIB%% -lcrypto
		8	ICEUTIL_FLAGS += $(OPENSSL_FLAGS)
8		9
9	PLATFORM_HAS_READLINE := yes	10	PLATFORM_HAS_READLINE := yes
10		11
Lines 20-22 Link Here
20	INSTALL_PROGRAM = %%INSTALL_PROGRAM%%	21	INSTALL_PROGRAM = %%INSTALL_PROGRAM%%
21	MCPP_HOME = $(LOCALBASE)	22	MCPP_HOME = $(LOCALBASE)
22	override DESTDIR =	23	override DESTDIR =
		24	rpathlink = -Wl,-rpath,$(1)

Lines 1-5 Link Here

(-)b/head/devel/ice/files/patch-cpp-config-Make.rules (-1 / +25 lines)
1	--- cpp/config/Make.rules.orig 2015-06-23 15:30:20.000000000 +0000	1	--- cpp/config/Make.rules.orig 2015-06-23 15:30:20.000000000 +0000
2	+++ cpp/config/Make.rules 2015-06-27 10:26:42.692387147 +0000	2	+++ cpp/config/Make.rules 2015-09-14 21:31:28.253993994 +0000
		3	@@ -203,11 +201,11 @@
		4	ICEUTIL_FLAGS = -DICE_PRIO_INHERIT
		5	endif
		6
		7	-OPENSSL_FLAGS += $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include)
		8	+OPENSSL_FLAGS += -I%%OPENSSLINC%%
		9	ifeq ($(OPENSSL_LIBS),)
		10	- OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto
		11	+ OPENSSL_LIBS = -L%%OPENSSLLIB%% -lssl -lcrypto
		12	endif
		13	-OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir)))
		14	+OPENSSL_RPATH_LINK = $(if %%OPENSSLRPATH%%,$(call rpathlink,%%OPENSSLRPATH%%))
		15
		16	ifeq ($(SSL_OS_LIBS),)
		17	SSL_OS_LIBS = $(OPENSSL_LIBS)
3	@@ -240,7 +240,9 @@	18	@@ -240,7 +240,9 @@
4	DB_FLAGS = -I/usr/local/include/db53	19	DB_FLAGS = -I/usr/local/include/db53
5	DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx	20	DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
Lines 11-13 Link Here
11	endif	26	endif
12	endif	27	endif
13	endif	28	endif
		29	@@ -381,7 +381,7 @@
		30	.cpp.o:
		31	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
		32	@mkdir -p .depend
		33	- @$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $< > .depend/$(*F).d
		34	+ @$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $(CXXFLAGS) $< > .depend/$(*F).d
		35
		36	.c.o:
		37	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<

Added Link Here

(-)b/head/devel/ice/files/patch-cpp-src-IceSSL-Makefile (+11 lines)
1	--- cpp/src/IceSSL/Makefile.orig 2015-09-14 22:49:55.236652991 +0000
2	+++ cpp/src/IceSSL/Makefile 2015-09-14 22:50:11.419995991 +0000
3	@@ -55,7 +55,7 @@
4	CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS)
5	SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
6
7	-LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS)
8	+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_RPATH_LINK) $(SSL_OS_LIBS) $(CXXLIBS)
9
10	ifeq ($(STATICLIBS),yes)
11	$(libdir)/$(LIBNAME): $(OBJS)




--- cpp/src/IceSSL/OpenSSLEngine.cpp.orig	2015-09-14 23:12:17.842563990 +0000
+++ cpp/src/IceSSL/OpenSSLEngine.cpp	2015-09-14 23:13:21.929560990 +0000
@@ -267,7 +267,9 @@
             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
             if(!entropyDaemon.empty())
             {
+#    ifndef OPENSSL_NO_EGD
                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
+#    endif
                 {
                     throw PluginInitializationException(__FILE__, __LINE__,
                                                         "IceSSL: EGD failure using file " + entropyDaemon);




--- cpp/test/IceSSL/configuration/AllTests.cpp.orig	2015-06-23 15:30:20.000000000 +0000
+++ cpp/test/IceSSL/configuration/AllTests.cpp	2015-09-15 00:15:34.865304987 +0000
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <openssl/ssl.h>
 #include <Ice/Ice.h>
 #include <IceSSL/Plugin.h>
 #include <TestCommon.h>
@@ -1292,14 +1293,22 @@
         InitializationData initData;
         initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
         initData.properties->setProperty("IceSSL.VerifyPeer", "0");
+#  ifdef SSL_TXT_TLSV1_1
+        initData.properties->setProperty("IceSSL.Protocols", "tlsv1_1");
+#  else
         initData.properties->setProperty("IceSSL.Protocols", "ssl3");
+#  endif
         CommunicatorPtr comm = initialize(initData);
 
         Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef));
         test(fact);
         Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
         d["IceSSL.VerifyPeer"] = "0";
+#  ifdef SSL_TXT_TLSV1_1
+        d["IceSSL.Protocols"] = "tlsv1_0";
+#  else
         d["IceSSL.Protocols"] = "tls";
+#  endif
         Test::ServerPrx server = fact->createServer(d);
         try
         {
@@ -1329,7 +1340,11 @@
         test(fact);
         d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
         d["IceSSL.VerifyPeer"] = "0";
+#  ifdef SSL_TXT_TLSV1_1
+        d["IceSSL.Protocols"] = "tlsv1_1, tlsv1_0";
+#  else
         d["IceSSL.Protocols"] = "tls, ssl3";
+#  endif
         server = fact->createServer(d);
         try
         {
@@ -1351,6 +1362,7 @@
             InitializationData initData;
             initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
             initData.properties->setProperty("IceSSL.VerifyPeer", "0");
+            // on modern openssl this simply fails as ssl3 is not supported by the client
             initData.properties->setProperty("IceSSL.Protocols", "ssl3");
             CommunicatorPtr comm = initialize(initData);
 
@@ -1386,14 +1398,22 @@
         {
             InitializationData initData;
             initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+#  ifdef SSL_TXT_TLSV1_1
+            initData.properties->setProperty("IceSSL.Protocols", "tlsv1_1");
+#  else
             initData.properties->setProperty("IceSSL.Protocols", "ssl3");
+#  endif
             CommunicatorPtr comm = initialize(initData);
 
             Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef));
             test(fact);
             Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
             d["IceSSL.VerifyPeer"] = "0";
+#  ifdef SSL_TXT_TLSV1_1
+            d["IceSSL.Protocols"] = "tls, tls1_1, tls1_2";
+#  else
             d["IceSSL.Protocols"] = "ssl3, tls, tls1_1, tls1_2";
+#  endif
             Test::ServerPrx server = fact->createServer(d);
             try
             {
@@ -3164,6 +3184,7 @@
 #endif
     }
 

     cout << "testing system CAs... " << flush;
     {
         InitializationData initData;
@@ -3208,6 +3229,7 @@
         comm->destroy();
     }
     cout << "ok" << endl;

Lines 1-5 Link Here

(-)b/head/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py (-2 / +19 lines)
1	--- cpp/test/IceSSL/configuration/run.py.orig 2015-06-27 13:03:48.260735765 +0000	1	--- cpp/test/IceSSL/configuration/run.py.orig 2015-06-23 15:30:20.000000000 +0000
2	+++ cpp/test/IceSSL/configuration/run.py 2015-06-27 13:03:54.559736750 +0000	2	+++ cpp/test/IceSSL/configuration/run.py 2015-09-16 18:16:01.933879982 +0000
		3	@@ -33,7 +33,7 @@
		4	elif TestUtil.isLinux():
		5	for c in ["cacert1.pem", "cacert2.pem"]:
		6	pem = os.path.join(certsPath, c)
		7	- os.system("rm -f {dir}/`openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath))
		8	+ os.system("rm -f {dir}/`%%OPENSSLBASE%%/bin/openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath))
		9
		10	cleanup()
		11	atexit.register(cleanup)
3	@@ -43,7 +43,7 @@	12	@@ -43,7 +43,7 @@
4	os.system("security create-keychain -p password %s" % keychainPath)	13	os.system("security create-keychain -p password %s" % keychainPath)
5	for cert in ["s_rsa_ca1.p12", "c_rsa_ca1.p12"]:	14	for cert in ["s_rsa_ca1.p12", "c_rsa_ca1.p12"]:
Lines 9-11 Link Here
9	#	18	#
10	# Create copies of the CA certificates named after the subject	19	# Create copies of the CA certificates named after the subject
11	# hash. This is used by the tests to find the CA certificates in	20	# hash. This is used by the tests to find the CA certificates in
		21	@@ -51,6 +51,6 @@
		22	#
		23	for c in ["cacert1.pem", "cacert2.pem"]:
		24	pem = os.path.join(certsPath, c)
		25	- os.system("cp {pem} {dir}/`openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath))
		26	+ os.system("cp {pem} {dir}/`%%OPENSSLBASE%%/bin/openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath))
		27
		28	TestUtil.clientServerTest(additionalClientOptions = '"%s"' % os.getcwd())

Return to bug 203163

Added Link Here

(-)b/head/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp (+12 lines)
1	--- cpp/src/IceSSL/OpenSSLEngine.cpp.orig 2015-09-14 23:12:17.842563990 +0000
2	+++ cpp/src/IceSSL/OpenSSLEngine.cpp 2015-09-14 23:13:21.929560990 +0000
3	@@ -267,7 +267,9 @@
4	string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
5	if(!entropyDaemon.empty())
6	{
7	+# ifndef OPENSSL_NO_EGD
8	if(RAND_egd(entropyDaemon.c_str()) <= 0)
9	+# endif
10	{
11	throw PluginInitializationException(__FILE__, __LINE__,
12	"IceSSL: EGD failure using file " + entropyDaemon);

Lines 1-6 Link Here

(-)b/head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp (-4 / +78 lines)
1	--- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2015-06-27 18:39:22.443351407 +0000	1	--- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2015-06-23 15:30:20.000000000 +0000
2	+++ cpp/test/IceSSL/configuration/AllTests.cpp 2015-06-27 18:40:30.619349872 +0000	2	+++ cpp/test/IceSSL/configuration/AllTests.cpp 2015-09-15 00:15:34.865304987 +0000
3	@@ -3164,6 +3164,7 @@	3	@@ -7,6 +7,7 @@
		4	//
		5	// **********************************************************************
		6
		7	+#include <openssl/ssl.h>
		8	#include <Ice/Ice.h>
		9	#include <IceSSL/Plugin.h>
		10	#include <TestCommon.h>
		11	@@ -1292,14 +1293,22 @@
		12	InitializationData initData;
		13	initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
		14	initData.properties->setProperty("IceSSL.VerifyPeer", "0");
		15	+# ifdef SSL_TXT_TLSV1_1
		16	+ initData.properties->setProperty("IceSSL.Protocols", "tlsv1_1");
		17	+# else
		18	initData.properties->setProperty("IceSSL.Protocols", "ssl3");
		19	+# endif
		20	CommunicatorPtr comm = initialize(initData);
		21
		22	Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef));
		23	test(fact);
		24	Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
		25	d["IceSSL.VerifyPeer"] = "0";
		26	+# ifdef SSL_TXT_TLSV1_1
		27	+ d["IceSSL.Protocols"] = "tlsv1_0";
		28	+# else
		29	d["IceSSL.Protocols"] = "tls";
		30	+# endif
		31	Test::ServerPrx server = fact->createServer(d);
		32	try
		33	{
		34	@@ -1329,7 +1340,11 @@
		35	test(fact);
		36	d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
		37	d["IceSSL.VerifyPeer"] = "0";
		38	+# ifdef SSL_TXT_TLSV1_1
		39	+ d["IceSSL.Protocols"] = "tlsv1_1, tlsv1_0";
		40	+# else
		41	d["IceSSL.Protocols"] = "tls, ssl3";
		42	+# endif
		43	server = fact->createServer(d);
		44	try
		45	{
		46	@@ -1351,6 +1362,7 @@
		47	InitializationData initData;
		48	initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
		49	initData.properties->setProperty("IceSSL.VerifyPeer", "0");
		50	+ // on modern openssl this simply fails as ssl3 is not supported by the client
		51	initData.properties->setProperty("IceSSL.Protocols", "ssl3");
		52	CommunicatorPtr comm = initialize(initData);
		53
		54	@@ -1386,14 +1398,22 @@
		55	{
		56	InitializationData initData;
		57	initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
		58	+# ifdef SSL_TXT_TLSV1_1
		59	+ initData.properties->setProperty("IceSSL.Protocols", "tlsv1_1");
		60	+# else
		61	initData.properties->setProperty("IceSSL.Protocols", "ssl3");
		62	+# endif
		63	CommunicatorPtr comm = initialize(initData);
		64
		65	Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef));
		66	test(fact);
		67	Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
68	d["IceSSL.VerifyPeer"] = "0";
69	+# ifdef SSL_TXT_TLSV1_1
70	+ d["IceSSL.Protocols"] = "tls, tls1_1, tls1_2";
71	+# else
72	d["IceSSL.Protocols"] = "ssl3, tls, tls1_1, tls1_2";
73	+# endif
74	Test::ServerPrx server = fact->createServer(d);
75	try
76	{
77	@@ -3164,6 +3184,7 @@
4	#endif	78	#endif
5	}	79	}
6		80
Lines 8-14 Link Here
8	cout << "testing system CAs... " << flush;	82	cout << "testing system CAs... " << flush;
9	{	83	{
10	InitializationData initData;	84	InitializationData initData;
11	@@ -3208,6 +3209,7 @@	85	@@ -3208,6 +3229,7 @@
12	comm->destroy();	86	comm->destroy();
13	}	87	}
14	cout << "ok" << endl;	88	cout << "ok" << endl;