You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mt...@apache.org on 2011/12/07 09:38:54 UTC
svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto:
apr_crypto_nss.c apr_crypto_nss.dsp
Author: mturk
Date: Wed Dec 7 08:38:54 2011
New Revision: 1211334
URL: http://svn.apache.org/viewvc?rev=1211334&view=rev
Log:
Add nspr4.lib as dependency
Modified:
apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp
Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c?rev=1211334&r1=1211333&r2=1211334&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c Wed Dec 7 08:38:54 2011
@@ -57,6 +57,7 @@ struct apr_crypto_t {
};
struct apr_crypto_config_t {
+ int _unused;
};
struct apr_crypto_key_t {
Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp?rev=1211334&r1=1211333&r2=1211334&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp Wed Dec 7 08:38:54 2011
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_crypto_nss-1.dll" /pdb:"Release\apr_crypto_nss-1.pdb" /implib:"Release\apr_crypto_nss-1.lib" /MACHINE:X86 /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_crypto_nss-1.dll" /pdb:"Release\apr_crypto_nss-1.pdb" /implib:"Release\apr_crypto_nss-1.lib" /MACHINE:X86 /opt:ref
# Begin Special Build Tool
TargetPath=Release\apr_crypto_nss-1.dll
SOURCE="$(InputPath)"
@@ -86,8 +86,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_crypto_nss-1.dll" /pdb:"Debug\apr_crypto_nss-1.pdb" /implib:"Debug\apr_crypto_nss-1.lib" /MACHINE:X86
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_crypto_nss-1.dll" /pdb:"Debug\apr_crypto_nss-1.pdb" /implib:"Debug\apr_crypto_nss-1.lib" /MACHINE:X86
# Begin Special Build Tool
TargetPath=Debug\apr_crypto_nss-1.dll
SOURCE="$(InputPath)"
@@ -118,8 +118,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_crypto_nss-1.dll" /pdb:"x64\Release\apr_crypto_nss-1.pdb" /implib:"x64\Release\apr_crypto_nss-1.lib" /MACHINE:X64 /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_crypto_nss-1.dll" /pdb:"x64\Release\apr_crypto_nss-1.pdb" /implib:"x64\Release\apr_crypto_nss-1.lib" /MACHINE:X64 /opt:ref
# Begin Special Build Tool
TargetPath=x64\Release\apr_crypto_nss-1.dll
SOURCE="$(InputPath)"
@@ -150,8 +150,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_crypto_nss-1.dll" /pdb:"x64\Debug\apr_crypto_nss-1.pdb" /implib:"x64\Debug\apr_crypto_nss-1.lib" /MACHINE:X64
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_crypto_nss-1.dll" /pdb:"x64\Debug\apr_crypto_nss-1.pdb" /implib:"x64\Debug\apr_crypto_nss-1.lib" /MACHINE:X64
# Begin Special Build Tool
TargetPath=x64\Debug\apr_crypto_nss-1.dll
SOURCE="$(InputPath)"
Re: svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto:
apr_crypto_nss.c apr_crypto_nss.dsp
Posted by Mladen Turk <mt...@apache.org>.
On 12/07/2011 09:32 PM, William A. Rowe Jr. wrote:
> On 12/7/2011 10:54 AM, Mladen Turk wrote:
>> On 12/07/2011 07:17 PM, Roy T. Fielding wrote:
>>> Just to confirm, this only gets compiled if the user has added a --with
>>> option specific to nss, right? Otherwise it impacts our license.
>>>
>>
>> Actually it's
>> editing apu.hw and setting APU_HAVE_CRYPTO to 1, and then
>> nmake -f Makefile.win CRYPTO_LIST="nss" ...
>>
>> So, yes, similar to --with-foo configure option
>> given the toolkit limitation.
>
> Only nss? No openssl support [yet]?
>
That was an example. OpenSSL is there, so
CRYPTO_LIST="nss openssl"
CRYPTO_LIST="openssl"
CRYPTO_LIST="nss"
Any combination is valid. The code and logic is copied from dbd drivers
so it behaves like DBD_LIST (explained as comment in Makefile.win)
Regards
--
^TM
Re: svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto:
apr_crypto_nss.c apr_crypto_nss.dsp
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 12/7/2011 10:54 AM, Mladen Turk wrote:
> On 12/07/2011 07:17 PM, Roy T. Fielding wrote:
>> Just to confirm, this only gets compiled if the user has added a --with
>> option specific to nss, right? Otherwise it impacts our license.
>>
>
> Actually it's
> editing apu.hw and setting APU_HAVE_CRYPTO to 1, and then
> nmake -f Makefile.win CRYPTO_LIST="nss" ...
>
> So, yes, similar to --with-foo configure option
> given the toolkit limitation.
Only nss? No openssl support [yet]?
Re: svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto:
apr_crypto_nss.c apr_crypto_nss.dsp
Posted by Mladen Turk <mt...@apache.org>.
On 12/07/2011 07:17 PM, Roy T. Fielding wrote:
> Just to confirm, this only gets compiled if the user has added a --with
> option specific to nss, right? Otherwise it impacts our license.
>
Actually it's
editing apu.hw and setting APU_HAVE_CRYPTO to 1, and then
nmake -f Makefile.win CRYPTO_LIST="nss" ...
So, yes, similar to --with-foo configure option
given the toolkit limitation.
Regards
--
^TM
Re: svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto: apr_crypto_nss.c apr_crypto_nss.dsp
Posted by Graham Leggett <mi...@sharp.fm>.
On 07 Dec 2011, at 8:17 PM, Roy T. Fielding wrote:
> Just to confirm, this only gets compiled if the user has added a --with
> option specific to nss, right? Otherwise it impacts our license.
Can't speak for Windows, but for Unix, yes. Without --with-crypto and --with-crypto-nss, the default is "don't compile it". Same for openssl:
#define APU_HAVE_CRYPTO 0
#define APU_HAVE_OPENSSL 0
#define APU_HAVE_NSS 0
Regards,
Graham
--
Re: svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto: apr_crypto_nss.c apr_crypto_nss.dsp
Posted by "Roy T. Fielding" <fi...@gbiv.com>.
Just to confirm, this only gets compiled if the user has added a --with
option specific to nss, right? Otherwise it impacts our license.
....Roy
On Dec 7, 2011, at 12:38 AM, mturk@apache.org wrote:
> Author: mturk
> Date: Wed Dec 7 08:38:54 2011
> New Revision: 1211334
>
> URL: http://svn.apache.org/viewvc?rev=1211334&view=rev
> Log:
> Add nspr4.lib as dependency
>
> Modified:
> apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
> apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp
>
> Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c?rev=1211334&r1=1211333&r2=1211334&view=diff
> ==============================================================================
> --- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c (original)
> +++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c Wed Dec 7 08:38:54 2011
> @@ -57,6 +57,7 @@ struct apr_crypto_t {
> };
>
> struct apr_crypto_config_t {
> + int _unused;
> };
>
> struct apr_crypto_key_t {
>
> Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp
> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp?rev=1211334&r1=1211333&r2=1211334&view=diff
> ==============================================================================
> --- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp (original)
> +++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp Wed Dec 7 08:38:54 2011
> @@ -54,8 +54,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_crypto_nss-1.dll" /pdb:"Release\apr_crypto_nss-1.pdb" /implib:"Release\apr_crypto_nss-1.lib" /MACHINE:X86 /opt:ref
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_crypto_nss-1.dll" /pdb:"Release\apr_crypto_nss-1.pdb" /implib:"Release\apr_crypto_nss-1.lib" /MACHINE:X86 /opt:ref
> # Begin Special Build Tool
> TargetPath=Release\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> @@ -86,8 +86,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_crypto_nss-1.dll" /pdb:"Debug\apr_crypto_nss-1.pdb" /implib:"Debug\apr_crypto_nss-1.lib" /MACHINE:X86
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_crypto_nss-1.dll" /pdb:"Debug\apr_crypto_nss-1.pdb" /implib:"Debug\apr_crypto_nss-1.lib" /MACHINE:X86
> # Begin Special Build Tool
> TargetPath=Debug\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> @@ -118,8 +118,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_crypto_nss-1.dll" /pdb:"x64\Release\apr_crypto_nss-1.pdb" /implib:"x64\Release\apr_crypto_nss-1.lib" /MACHINE:X64 /opt:ref
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_crypto_nss-1.dll" /pdb:"x64\Release\apr_crypto_nss-1.pdb" /implib:"x64\Release\apr_crypto_nss-1.lib" /MACHINE:X64 /opt:ref
> # Begin Special Build Tool
> TargetPath=x64\Release\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> @@ -150,8 +150,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_crypto_nss-1.dll" /pdb:"x64\Debug\apr_crypto_nss-1.pdb" /implib:"x64\Debug\apr_crypto_nss-1.lib" /MACHINE:X64
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_crypto_nss-1.dll" /pdb:"x64\Debug\apr_crypto_nss-1.pdb" /implib:"x64\Debug\apr_crypto_nss-1.lib" /MACHINE:X64
> # Begin Special Build Tool
> TargetPath=x64\Debug\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
>
>