Changeset 153


Ignore:
Timestamp:
Sep 20, 2010, 1:05:56 PM (10 years ago)
Author:
dmik
Message:

jdk: Adopted and enabled com.security.mscapi package.

Location:
trunk/openjdk/jdk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/jdk/make/sun/Makefile

    r144 r153  
    7070          native2ascii serialver tools jconsole
    7171else
    72 SUBDIRS = jar javazic misc net \
     72SUBDIRS = jar security javazic misc net \
    7373          rmi beans $(JDBC_SUBDIR) \
    7474          text nio launcher management $(ORG_SUBDIR) \
  • trunk/openjdk/jdk/make/sun/net/FILES_java.gmk

    r144 r153  
    8888        sun/net/www/protocol/http/NegotiatorImpl.java \
    8989        sun/net/www/protocol/http/NegotiateCallbackHandler.java \
    90 
    91 ifndef OS2_TEMP # security
    92 FILES_java += \
    9390        sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
    9491        sun/net/www/protocol/https/HttpsClient.java \
     
    9794        sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
    9895        sun/net/www/protocol/https/Handler.java \
    99 
    100 endif
    101 FILES_java += \
    10296        sun/net/www/protocol/jar/Handler.java \
    10397        sun/net/www/protocol/jar/URLJarFile.java \
  • trunk/openjdk/jdk/make/sun/security/mscapi/Makefile

    r74 r153  
    158158# Libraries to link
    159159#
    160 ifeq ($(filter-out windows os2, $(PLATFORM)),)
     160ifeq ($(PLATFORM), windows)
    161161  OTHER_LDLIBS += $(JVMLIB) Crypt32.Lib
     162endif
     163ifeq ($(PLATFORM), os2)
     164  OTHER_LDLIBS += $(JVMLIB) -lCrypt32.Lib
    162165endif
    163166
  • trunk/openjdk/jdk/src/windows/native/sun/security/mscapi/security.cpp

    r2 r153  
    3535#include <wincrypt.h>
    3636#include <stdio.h>
    37 
     37#ifdef __WIN32OS2__
     38#include <excpt.h>
     39#endif
    3840
    3941#define OID_EKU_ANY         "2.5.29.37.0"
     
    843845            pwszContainerName = new WCHAR[dwDataLen];
    844846
    845             if (mbstowcs(pwszContainerName, pszContainerName, dwDataLen) == 0) {
     847            if (mbstowcs((wchar_t*)pwszContainerName, pszContainerName, dwDataLen) == 0) {
    846848                ThrowException(env, KEYSTORE_EXCEPTION, GetLastError());
    847849                __leave;
     
    880882            pwszProviderName = new WCHAR[dwDataLen];
    881883
    882             if (mbstowcs(pwszProviderName, pszProviderName, dwDataLen) == 0) {
     884            if (mbstowcs((wchar_t*)pwszProviderName, pszProviderName, dwDataLen) == 0) {
    883885                ThrowException(env, KEYSTORE_EXCEPTION, GetLastError());
    884886                __leave;
Note: See TracChangeset for help on using the changeset viewer.