diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
| commit | a60a923d6ad01029494dfad34685983426b75093 (patch) | |
| tree | 6b73a6f5f9ecaac82c784345daf1a11055bcbd78 /lib/public_key | |
| parent | e6c7db595f50ae0606b3177451bcfcdc28f9d3c0 (diff) | |
| parent | 56e08cb2d1faa279961413729e48ef1f3275a575 (diff) | |
| download | otp-a60a923d6ad01029494dfad34685983426b75093.tar.gz otp-a60a923d6ad01029494dfad34685983426b75093.tar.bz2 otp-a60a923d6ad01029494dfad34685983426b75093.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/doc/src/public_key.xml | 3 | ||||
| -rw-r--r-- | lib/public_key/src/public_key.app.src | 2 | ||||
| -rw-r--r-- | lib/public_key/test/pkits_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/public_key/vsn.mk | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 143e41bae4..002f641f1d 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -43,7 +43,8 @@ <title>public_key</title> <list type="bulleted"> - <item>public_key requires the crypto application.</item> + <item>public_key requires the crypto and asn1 applications, the latter since R16 (hopefully the runtime dependency on asn1 will + be removed again in the future).</item> <item>Supports <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280 </url> - Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile </item> diff --git a/lib/public_key/src/public_key.app.src b/lib/public_key/src/public_key.app.src index 9f0677606d..736a778a4b 100644 --- a/lib/public_key/src/public_key.app.src +++ b/lib/public_key/src/public_key.app.src @@ -11,7 +11,7 @@ 'OTP-PUB-KEY', 'PKCS-FRAME' ]}, - {applications, [crypto, kernel, stdlib]}, + {applications, [asn1, crypto, kernel, stdlib]}, {registered, []}, {env, []} ] diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl index c490493e13..9180fa968b 100644 --- a/lib/public_key/test/pkits_SUITE.erl +++ b/lib/public_key/test/pkits_SUITE.erl @@ -113,12 +113,14 @@ groups() -> init_per_suite(Config) -> try crypto:start() of ok -> + application:start(asn1), crypto_support_check(Config) catch _:_ -> {skip, "Crypto did not start"} end. end_per_suite(_Config) -> + application:stop(asn1), application:stop(crypto). %%-------------------------------------------------------------------- diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index 5a64140c67..f2596e3d85 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -58,12 +58,14 @@ groups() -> init_per_suite(Config) -> try crypto:start() of ok -> + application:start(asn1), Config catch _:_ -> {skip, "Crypto did not start"} end. end_per_suite(_Config) -> + application:stop(asn1), application:stop(crypto). %%------------------------------------------------------------------- diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index bd20a5546b..b820f24d2a 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 0.18 +PUBLIC_KEY_VSN = 0.19 |