diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:53:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:53:12 +0200 |
| commit | 56e08cb2d1faa279961413729e48ef1f3275a575 (patch) | |
| tree | d3bea204f76c2202090f1b500c9d47c4fca661ed /lib/crypto | |
| parent | c095c23a9d0e07ecde8c1ca7ad24ffb9f2ca3182 (diff) | |
| parent | 6166867da5cbfe97b09cddf2e079178a2e959c44 (diff) | |
| download | otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.gz otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.bz2 otp-56e08cb2d1faa279961413729e48ef1f3275a575.zip | |
Merge branch 'ia/public_key/crypto/prepare-for-release' into maint
* ia/public_key/crypto/prepare-for-release:
public_key & ssl: Add ASN-1 dependency
crypto & public_key: prepare for release
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/src/crypto.appup.src | 14 | ||||
| -rw-r--r-- | lib/crypto/vsn.mk | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/crypto/src/crypto.appup.src b/lib/crypto/src/crypto.appup.src index b39ef734eb..5b4ce5acee 100644 --- a/lib/crypto/src/crypto.appup.src +++ b/lib/crypto/src/crypto.appup.src @@ -1,7 +1,8 @@ +%% -*- erlang -*- %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -17,6 +18,11 @@ %% %CopyrightEnd% %% {"%VSN%", - [], - [] -}. + [ + {<<"2\\.*">>, [{restart_application, crypto}]} + {<<"1\\.*">>, [{restart_application, crypto}]} + ], + [ + {<<"2\\.*">>, [{restart_application, crypto}]} + {<<"1\\.*">>, [{restart_application, crypto}]} + ]}. diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk index 2a0cb57aa9..d5d7c8a128 100644 --- a/lib/crypto/vsn.mk +++ b/lib/crypto/vsn.mk @@ -1 +1 @@ -CRYPTO_VSN = 2.3 +CRYPTO_VSN = 3.0 |